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 2bfee74d7c1771a05a31dcc2e4953499330da72b
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sat Nov 10 13:22:41 2018 +0100
[MNG-6512] PoC - set minimum JDK to 11
---
Jenkinsfile | 12 ++++--------
pom.xml | 45 ++++++++++++++++++++++-----------------------
2 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fe3791b..a2ef6cd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,10 +21,10 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr:
'5', numToKeepStr: e
def buildOs = 'linux'
def buildJdk = '8'
-def buildMvn = '3.5.4'
+def buildMvn = '3.6.0'
def runITsOses = ['linux', 'windows']
-def runITsJdks = ['7', '8', '9']
-def runITsMvn = '3.5.4'
+def runITsJdks = ['11']
+def runITsMvn = '3.6.0'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" //
-DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
@@ -93,11 +93,7 @@ for (String os in runITsOses) {
junitPublisher(ignoreAttachments: false)
]) {
String cmd = "${runITscommand}
-DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
- if (stageId.endsWith('-jdk7')) {
- // Java 7u80 has TLS 1.2 disabled by default:
need to explicitly enable
- cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
- }
-
+
if (isUnix()) {
sh "${cmd}"
} else {
diff --git a/pom.xml b/pom.xml
index d822c1f..ba1e6db 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.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<classWorldsVersion>2.5.2</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.8.1</commonsLangVersion>
@@ -549,27 +550,6 @@ under the License.
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <id>check-java-compat</id>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
<version>1.2</version>
@@ -684,5 +664,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>
