From 3839432757f08f4f21d0f246fe1837deeba0d1a6 Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Mon, 9 Jul 2018 10:08:08 -0700
Subject: [PATCH] Configure Java 7 language level

---
 apis/filesystem/pom.xml | 14 --------------
 project/pom.xml         | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index 5e65b02e90..1515539e69 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -32,9 +32,6 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <!-- This api has been written in a manner which requires Java language level 7. -->
-    <maven.compile.source>1.7</maven.compile.source>
-    <maven.compile.target>1.7</maven.compile.target>
     <jclouds.osgi.export>org.jclouds.filesystem*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
   </properties>
@@ -102,17 +99,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/project/pom.xml b/project/pom.xml
index 9b83246da2..7ed3bda4cd 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -217,8 +217,8 @@
   </developers>
 
   <properties>
-    <maven.compile.source>1.6</maven.compile.source>
-    <maven.compile.target>1.6</maven.compile.target>
+    <maven.compile.source>1.7</maven.compile.source>
+    <maven.compile.target>1.7</maven.compile.target>
     <jdk.version>1.7</jdk.version>
     <maven.compile.deprecation>true</maven.compile.deprecation>
     <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
@@ -634,8 +634,8 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
-            <version>1.1</version>
+            <artifactId>java17</artifactId>
+            <version>1.0</version>
           </signature>
         </configuration>
       </plugin>
@@ -717,7 +717,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[1.6,)</version>
+                  <version>[1.7,)</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <version>[3.0.2,)</version>
@@ -1280,7 +1280,10 @@
             <groupId>org.gaul</groupId>
             <artifactId>modernizer-maven-plugin</artifactId>
             <configuration>
+              <!-- Fix fiolations before uncommenting
               <javaVersion>${maven.compile.source}</javaVersion>
+              -->
+              <javaVersion>1.6</javaVersion>
               <!-- in jclouds-project use the local file. ${project.basedir}
                 required here as 1.1.0 of the modernizer plugin can't find the
                 exclusions file otherwise -->
@@ -1329,7 +1332,10 @@
               </dependency>
             </dependencies>
             <configuration>
+              <!-- Fix vioaltions and uncomment again
               <javaVersion>${maven.compile.source}</javaVersion>
+              -->
+              <javaVersion>1.6</javaVersion>
               <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
             </configuration>
           </plugin>