inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set declared Java version to 11.

Browse Source 
This should ensure that IDEs default to the correct Java version.
This commit is contained in:
Tom Page
2019-09-20 16:00:11 +01:00
parent 756208affb
commit c2a27f6370
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@@ -484,8 +484,10 @@
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.war.plugin.version>3.2.2</maven.war.plugin.version> <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <java.version>11</java.version>
<maven.build.testSourceVersion>1.8</maven.build.testSourceVersion> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<testJavaVersion>${java.version}</testJavaVersion>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version> <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.8.0</maven.compiler.version> <maven.compiler.version>3.8.0</maven.compiler.version>
<maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin> <maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
@@ -603,13 +605,17 @@
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[1.8.0,)</version> <version>[${java.version},)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
@@ -838,8 +844,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version> <version>${maven.compiler.version}</version>
<configuration> <configuration>
<source>${maven.build.sourceVersion}</source> <source>${maven.compiler.source}</source>
<target>${maven.build.sourceVersion}</target> <target>${maven.compiler.target}</target>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -849,8 +855,8 @@
<goal>testCompile</goal> <goal>testCompile</goal>
</goals> </goals>
<configuration> <configuration>
<source>${maven.build.testSourceVersion}</source> <source>${testJavaVersion}</source>
<target>${maven.build.testSourceVersion}</target> <target>${testJavaVersion}</target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@@ -945,7 +951,7 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<doclint>none</doclint> <doclint>none</doclint>
<source>8</source> <source>${java.version}</source>
</configuration> </configuration>
</plugin> </plugin>

2
rm-automation/pom.xml
View File

@@ -24,8 +24,6 @@
</modules> </modules>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<suiteXmlFile>testng.xml</suiteXmlFile> <suiteXmlFile>testng.xml</suiteXmlFile>
<skip.automationtests>true</skip.automationtests> <skip.automationtests>true</skip.automationtests>
</properties> </properties>

1
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -12,7 +12,6 @@
</parent> </parent>
<properties> <properties>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>
<ags.share>alfresco-governance-services-community-share</ags.share> <ags.share>alfresco-governance-services-community-share</ags.share>
<ags.repo>alfresco-governance-services-community-repo</ags.repo> <ags.repo>alfresco-governance-services-community-repo</ags.repo>

2
rm-community/rm-community-rest-api-explorer/pom.xml
View File

@@ -11,8 +11,6 @@
</parent> </parent>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>