Configure Java 7 language level

This commit is contained in:
Ignasi Barrera 2018-07-09 10:08:08 -07:00
parent 019ccb7431
commit 3839432757
No known key found for this signature in database
GPG Key ID: 3D5414A0D959B94F
2 changed files with 11 additions and 19 deletions

View File

@ -32,9 +32,6 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<properties> <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.export>org.jclouds.filesystem*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties> </properties>
@ -102,17 +99,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</build> </build>

View File

@ -217,8 +217,8 @@
</developers> </developers>
<properties> <properties>
<maven.compile.source>1.6</maven.compile.source> <maven.compile.source>1.7</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target> <maven.compile.target>1.7</maven.compile.target>
<jdk.version>1.7</jdk.version> <jdk.version>1.7</jdk.version>
<maven.compile.deprecation>true</maven.compile.deprecation> <maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base> <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
@ -634,8 +634,8 @@
<configuration> <configuration>
<signature> <signature>
<groupId>org.codehaus.mojo.signature</groupId> <groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java16</artifactId> <artifactId>java17</artifactId>
<version>1.1</version> <version>1.0</version>
</signature> </signature>
</configuration> </configuration>
</plugin> </plugin>
@ -717,7 +717,7 @@
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[1.6,)</version> <version>[1.7,)</version>
</requireJavaVersion> </requireJavaVersion>
<requireMavenVersion> <requireMavenVersion>
<version>[3.0.2,)</version> <version>[3.0.2,)</version>
@ -1280,7 +1280,10 @@
<groupId>org.gaul</groupId> <groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId> <artifactId>modernizer-maven-plugin</artifactId>
<configuration> <configuration>
<!-- Fix fiolations before uncommenting
<javaVersion>${maven.compile.source}</javaVersion> <javaVersion>${maven.compile.source}</javaVersion>
-->
<javaVersion>1.6</javaVersion>
<!-- in jclouds-project use the local file. ${project.basedir} <!-- in jclouds-project use the local file. ${project.basedir}
required here as 1.1.0 of the modernizer plugin can't find the required here as 1.1.0 of the modernizer plugin can't find the
exclusions file otherwise --> exclusions file otherwise -->
@ -1329,7 +1332,10 @@
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<!-- Fix vioaltions and uncomment again
<javaVersion>${maven.compile.source}</javaVersion> <javaVersion>${maven.compile.source}</javaVersion>
-->
<javaVersion>1.6</javaVersion>
<exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile> <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
</configuration> </configuration>
</plugin> </plugin>