Set ALL settings to Java 7 for compiler plugin + remove test on JDK version

This commit is contained in:
Samuel Langlois 2015-07-23 10:15:45 +01:00
parent 3116123800
commit d483c01a6c
3 changed files with 6 additions and 21 deletions

View File

@ -14,15 +14,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>

View File

@ -131,6 +131,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.archetype.version>2.2</maven.archetype.version>
<alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
<alfresco.community.default.version>5.0.d</alfresco.community.default.version>
@ -188,12 +190,10 @@
<id>sdk-release</id>
<properties>
<maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest</maven.site.url>
<maven.release.version>2.5.1</maven.release.version>
<maven.release.version>2.5.2</maven.release.version>
<maven.release.goals>deploy site-deploy</maven.release.goals>
<maven.site.version>3.4</maven.site.version>
<maven.changes.version>2.10</maven.changes.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
@ -221,7 +221,7 @@
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>

View File

@ -127,8 +127,8 @@
<!-- Maven Plugins Versions used by the SDK -->
<maven.compiler.version>3.2</maven.compiler.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.clean.version>2.6.1</maven.clean.version>
<maven.dependency.version>2.9</maven.dependency.version>
<maven.enforcer.plugin>1.4</maven.enforcer.plugin>
@ -853,12 +853,6 @@
<regex>^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$</regex>
</requireProperty>
<!-- Test for JDK version -->
<requireJavaVersion>
<version>[1.8.0,)</version>
<message>Alfresco 5.0.d and 5.0.1 runs on JDK8</message>
</requireJavaVersion>
<!-- Test for Maven version -->
<requireMavenVersion>
<version>3.2.2</version>