This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6512-build-11 in repository https://gitbox.apache.org/repos/asf/maven.git
commit b0e6837525e62f2c73a4175427a519d716254d4d Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Wed Dec 18 22:45:08 2019 +0100 [MNG-6512] PoC - set minimum JDK to 11 to test compilation/test problems - enforcer update extras o 1.1 (have support for Java 11 and 12-ea) - skip sniffer - not important with compiler plugin release tag - update Plexus metadata plugin to snapshot version (Java 11 support) (DONE 2.0.0) Java 11 + Maven Enforcer Linux --- Jenkinsfile | 6 +++--- pom.xml | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff917a2..f45b917 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,10 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))]) def buildOs = 'linux' -def buildJdk = '8' +def buildJdk = '11' def buildMvn = '3.6.2' -def runITsOses = ['linux', 'windows'] -def runITsJdks = ['8', '11', '13', '14'] +def runITsOses = ['linux'] +def runITsJdks = ['11'] def runITsMvn = '3.6.2' def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests diff --git a/pom.xml b/pom.xml index ef2764d..9d5ec1e 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,10 @@ under the License. <inceptionYear>2001</inceptionYear> <properties> + <javaVersion>11</javaVersion> <maven.version>3.0.5</maven.version> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> <classWorldsVersion>2.6.0</classWorldsVersion> <commonsCliVersion>1.4</commonsCliVersion> <commonsLangVersion>3.8.1</commonsLangVersion> @@ -588,15 +589,23 @@ under the License. </pluginManagement> <plugins> <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>extra-enforcer-rules</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <version>1.18</version> <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java18</artifactId> - <version>1.0</version> - </signature> + <skip>true</skip><!-- no rules for Java 11 yet --> </configuration> <executions> <execution> @@ -723,5 +732,24 @@ under the License. </plugins> </build> </profile> + <profile> + <id>jdk11plus</id> + <activation> + <jdk>[11,)</jdk> + </activation> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <release>11</release> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> </profiles> </project>