From 79d8e1ab432f5aa94bb67596e00def8684658030 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 16 May 2019 14:22:37 -0700
Subject: [PATCH] Some tweaks to license download

... related to http -> https conversion
---
 .../bosh-language-server/pom.xml              |  5 +++-
 headless-services/commons/pom.xml             | 23 +++++++++----------
 .../concourse-language-server/pom.xml         | 15 ++++--------
 .../manifest-yaml-language-server/pom.xml     | 17 +++++---------
 .../spring-boot-language-server/pom.xml       | 18 ++++-----------
 5 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml
index 3bd732878..c05dfc4fa 100644
--- a/headless-services/bosh-language-server/pom.xml
+++ b/headless-services/bosh-language-server/pom.xml
@@ -84,6 +84,10 @@
 				</executions>
 				<configuration>
 					<licenseUrlReplacements>
+						<licenseUrlReplacement>
+							<regexp>http://javolution.org/LICENSE.txt</regexp>
+							<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
+						</licenseUrlReplacement>
 						<licenseUrlReplacement>
 							<regexp>http://(.*)</regexp>
 							<replacement>https://$1</replacement>
@@ -186,7 +190,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 816b278aa..8477b2ec5 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -123,18 +123,17 @@
 	</properties>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<!-- Set source 1.8 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 
 	<dependencies>
diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml
index 0562aea68..15ce1a824 100644
--- a/headless-services/concourse-language-server/pom.xml
+++ b/headless-services/concourse-language-server/pom.xml
@@ -66,15 +66,6 @@
 
 	<build>
 		<plugins>
-			<!-- Set source 1.8 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<!-- Configure fat jar -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -90,6 +81,7 @@
 					</execution>
 				</executions>
 			</plugin>
+			
 			<!-- generate and package license information for included dependencies -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -106,6 +98,10 @@
 				</executions>
 				<configuration>
 					<licenseUrlReplacements>
+						<licenseUrlReplacement>
+							<regexp>http://javolution.org/LICENSE.txt</regexp>
+							<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
+						</licenseUrlReplacement>
 						<licenseUrlReplacement>
 							<regexp>http://(.*)</regexp>
 							<replacement>https://$1</replacement>
@@ -208,7 +204,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>
diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml
index 281e91d1f..a27cd2e7e 100644
--- a/headless-services/manifest-yaml-language-server/pom.xml
+++ b/headless-services/manifest-yaml-language-server/pom.xml
@@ -86,15 +86,6 @@
 
 	<build>
 		<plugins>
-			<!-- Set source 1.8 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<!-- Configure fat jar -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -110,7 +101,7 @@
 					</execution>
 				</executions>
 			</plugin>
-
+			
 			<!-- generate and package license information for included dependencies -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -127,6 +118,10 @@
 				</executions>
 				<configuration>
 					<licenseUrlReplacements>
+						<licenseUrlReplacement>
+							<regexp>http://javolution.org/LICENSE.txt</regexp>
+							<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
+						</licenseUrlReplacement>
 						<licenseUrlReplacement>
 							<regexp>http://(.*)</regexp>
 							<replacement>https://$1</replacement>
@@ -229,7 +224,7 @@
 					</execution>
 				</executions>
 			</plugin>
-
+			
 		</plugins>
 	</build>
 </project>
diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
index 99340990e..66ec79161 100644
--- a/headless-services/spring-boot-language-server/pom.xml
+++ b/headless-services/spring-boot-language-server/pom.xml
@@ -107,8 +107,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<!-- <dependency> <groupId>com.fasterxml</groupId> <artifactId>aalto-xml</artifactId> 
-			<version>1.1.1</version> </dependency> -->
 
 		<!-- Test harness -->
 		<dependency>
@@ -132,15 +130,6 @@
 	</dependencies>
 	<build>
 		<plugins>
-			<!-- Set source 1.8 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<!-- Configure fat jar -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -168,7 +157,7 @@
 					</excludes>
 				</configuration>
 			</plugin>
-
+			
 			<!-- generate and package license information for included dependencies -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -185,6 +174,10 @@
 				</executions>
 				<configuration>
 					<licenseUrlReplacements>
+						<licenseUrlReplacement>
+							<regexp>http://javolution.org/LICENSE.txt</regexp>
+							<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
+						</licenseUrlReplacement>
 						<licenseUrlReplacement>
 							<regexp>http://(.*)</regexp>
 							<replacement>https://$1</replacement>
@@ -287,7 +280,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 		</plugins>
 	</build>
 </project>