From 89c9d836f1f66a2f90f9aa1b1e8be3fad3fcd677 Mon Sep 17 00:00:00 2001
From: Cheena Malhotra <v-chmalh@microsoft.com>
Date: Wed, 12 Jun 2019 15:02:06 -0700
Subject: [PATCH] Maven | Merge Shade plugins + update dependent library
 versions (#1081)

---
 build.gradle | 27 ++++++++++++++-------------
 pom.xml      | 22 +++++-----------------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index c9f4ac7fa..c7a985819 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,23 +108,24 @@ repositories {
 }
 
 dependencies {
-	compile 'org.osgi:org.osgi.core:4.3.1',
-			'org.osgi:org.osgi.compendium:4.3.1'
-	compileOnly 'com.microsoft.azure:azure-keyvault:1.2.0',
-			'com.microsoft.azure:azure-keyvault-webkey:1.2.0',
-			'com.microsoft.rest:client-runtime:1.6.5',
-			'com.microsoft.azure:adal4j:1.6.3',
+	compile 'org.osgi:org.osgi.core:6.0.0',
+			'org.osgi:org.osgi.compendium:5.0.0'
+	compileOnly 'com.microsoft.azure:azure-keyvault:1.2.1',
+			'com.microsoft.azure:azure-keyvault-webkey:1.2.1',
+			'com.microsoft.rest:client-runtime:1.6.8',
+			'com.microsoft.azure:adal4j:1.6.4',
 			'org.antlr:antlr4-runtime:4.7.2'
-	testCompile 'org.junit.platform:junit-platform-console:1.4.0', 
-			'org.junit.platform:junit-platform-commons:1.4.0', 
-			'org.junit.platform:junit-platform-engine:1.4.0', 
-			'org.junit.platform:junit-platform-launcher:1.4.0', 
-			'org.junit.platform:junit-platform-runner:1.4.0', 
+	testCompile 'org.junit.platform:junit-platform-console:1.4.2', 
+			'org.junit.platform:junit-platform-commons:1.4.2', 
+			'org.junit.platform:junit-platform-engine:1.4.2', 
+			'org.junit.platform:junit-platform-launcher:1.4.2', 
+			'org.junit.platform:junit-platform-runner:1.4.2', 
 			'org.junit.platform:junit-platform-surefire-provider:1.3.2', 
-			'org.junit.jupiter:junit-jupiter-api:5.4.0', 
-			'org.junit.jupiter:junit-jupiter-engine:5.4.0', 
+			'org.junit.jupiter:junit-jupiter-api:5.4.2', 
+			'org.junit.jupiter:junit-jupiter-engine:5.4.2', 
 			'com.zaxxer:HikariCP:3.3.1', 
 			'org.apache.commons:commons-dbcp2:2.6.0', 
 			'org.slf4j:slf4j-nop:1.7.26',
+			'org.antlr:antlr4-runtime:4.7.2',
 			'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE'
 }
diff --git a/pom.xml b/pom.xml
index 06ff594e0..5c1fc9336 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<!-- Driver Dependencies -->
 		<azure.keyvault.version>1.2.1</azure.keyvault.version>
 		<azure.adal4j.version>1.6.4</azure.adal4j.version>
-		<rest.client.version>1.6.7</rest.client.version>
+		<rest.client.version>1.6.8</rest.client.version>
 		<osgi.core.version>6.0.0</osgi.core.version>
 		<osgi.comp.version>5.0.0</osgi.comp.version>
 		<antlr.runtime.version>4.7.2</antlr.runtime.version>
@@ -94,7 +94,7 @@
 			<version>${rest.client.version}</version>
 			<optional>true</optional>
 		</dependency>
-		
+
 		<!-- dependencies for ANTLR -->
 		<dependency>
 			<groupId>org.antlr</groupId>
@@ -335,6 +335,7 @@
 		</testResources>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>3.2.1</version>
 				<executions>
@@ -361,9 +362,11 @@
 										<exclude>META-INF/*.SF</exclude>
 										<exclude>META-INF/*.DSA</exclude>
 										<exclude>META-INF/*.RSA</exclude>
+										<exclude>META-INF/NOTICE*</exclude>
 									</excludes>
 								</filter>
 							</filters>
+							<outputFile>${project.build.directory}\${project.build.finalName}-shaded.jar</outputFile>
 						</configuration>
 					</execution>
 				</executions>
@@ -513,21 +516,6 @@
 					<destFile>${project.build.directory}/jacoco.exec</destFile>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.1</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<outputFile>${project.build.directory}/${project.build.finalName}-shaded.jar</outputFile>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>