From 90b40dc683e66ab853c1ddf239735198a327faf5 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Thu, 21 Sep 2017 14:47:24 +0200
Subject: [PATCH] Updated maven-dependency-plugin to 3.0.2 to solve JDK 9 issue
 due to https://issues.apache.org/jira/browse/MDEP-571.

---
 .../jetty-gcloud-session-manager/pom.xml      | 100 +++++++++---------
 pom.xml                                       |   2 +-
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 4d92f1f6055..6156e069d9d 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.gcloud</groupId>
     <artifactId>gcloud-parent</artifactId>
@@ -22,12 +24,12 @@
       <version>${gcloud.version}</version>
       <exclusions>
         <exclusion>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
         </exclusion>
         <exclusion>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>javax.servlet-api</artifactId>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
         </exclusion>
       </exclusions>
 
@@ -57,50 +59,51 @@
     </dependency>
   </dependencies>
 
- <properties>
-   <bundle-symbolic-name>${project.groupId}.session</bundle-symbolic-name>
- </properties>
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.session</bundle-symbolic-name>
+  </properties>
 
   <build>
     <plugins>
       <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <executions>
-              <execution>
-                  <goals>
-                      <goal>manifest</goal>
-                  </goals>
-                  <configuration>
-                      <instructions>
-                          <Export-Package>org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";</Export-Package>
-                      </instructions>
-                    </configuration>
-                 </execution>
-            </executions>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Export-Package>
+                  org.eclipse.jetty.gcloud.session.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";
+                </Export-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-	  <version>3.0.0</version>
-	  <executions>
-	      <execution>
-	          <id>build-deps-file</id>
-		  <phase>generate-resources</phase>
-                  <goals>
-                      <goal>list</goal>
-                  </goals>
-                  <configuration>
-		    <appendOutput>false</appendOutput>
-		    <outputFile>${project.build.directory}/deps.txt</outputFile>
-		    <sort>true</sort>
-                    <excludeGroupIds>org.eclipse.jetty</excludeGroupIds>
-		    <prependGroupId>true</prependGroupId>
-		    <includeScope>runtime</includeScope>
-                  </configuration>
-	      </execution>
-	  </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>build-deps-file</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>list</goal>
+            </goals>
+            <configuration>
+              <appendOutput>false</appendOutput>
+              <outputFile>${project.build.directory}/deps.txt</outputFile>
+              <sort>true</sort>
+              <excludeGroupIds>org.eclipse.jetty</excludeGroupIds>
+              <prependGroupId>true</prependGroupId>
+              <includeScope>runtime</includeScope>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -118,15 +121,15 @@
                                match=" *(.*):(.*):jar:(.*):[a-z]*"
                                replace="maven://\1/\2/\3|lib/gcloud/\2-\3.jar"
                                byline="true"
-		/>
+                />
                 <replaceregexp file="${project.build.directory}/deps.txt"
                                match="The following files have been resolved:"
                                replace="[files]"
                 />
               </tasks>
             </configuration>
-	  </execution>
-           <execution>
+          </execution>
+          <execution>
             <id>process-mod</id>
             <phase>process-resources</phase>
             <goals>
@@ -141,8 +144,7 @@
               </tasks>
             </configuration>
           </execution>
-
-         </executions>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -161,7 +163,7 @@
           </execution>
         </executions>
       </plugin>
-   </plugins>
+    </plugins>
   </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 7e5c1ac9650..851ba88329d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.0.1</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>