[maven] branch MNG-6512-build-11 updated (b2b2f5f -> 98332d4)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch MNG-6512-build-11 updated (b2b2f5f -> 98332d4)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch MNG-6512-build-11
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard b2b2f5f  Enforcer and sniffer - skip
 discard 2bfee74  [MNG-6512] PoC - set minimum JDK to 11
     add 78f605e  [MNG-6515] Fix Javadoc build errors
     add f92bd9e  [MNG-6481] Run Maven Core Integration Tests with Java 7, 8 and 11
     add 86d4a91  [MNGSITE-357] README.md: Maven user list link not working
     add 9f07b03  [MNG-6261] - using File apis to compare
     add e4e33f7  [MNG-6261] Relative parent POM resolution failing in 3.5.0 with complex multimodule builds
     new 98332d4  [MNG-6512] PoC - set minimum JDK to 11 to test compilation/test problems

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b2b2f5f)
            \
             N -- N -- N   refs/heads/MNG-6512-build-11 (98332d4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |  2 +-
 maven-artifact/pom.xml                             |  4 +-
 .../repository/MavenArtifactRepository.java        |  2 +-
 .../plugin/PluginParameterExpressionEvaluator.java |  4 +-
 .../maven/model/building/DefaultModelBuilder.java  |  3 +-
 .../maven/model/building/FileModelSource.java      | 23 +++++++
 .../model/interpolation/ModelInterpolator.java     |  2 +-
 .../maven/model/building/FileModelSourceTest.java  | 75 ++++++++++++++++++++++
 maven-model/src/main/mdo/maven.mdo                 | 38 +++++------
 .../java/org/apache/maven/plugin/AbstractMojo.java |  5 +-
 maven-settings/src/main/mdo/settings.mdo           |  2 +-
 pom.xml                                            | 16 +++--
 12 files changed, 143 insertions(+), 33 deletions(-)
 create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java

Reply | Threaded
Open this post in threaded view
|

[maven] 01/01: [MNG-6512] PoC - set minimum JDK to 11 to test compilation/test problems

slachiewicz
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 98332d4f9ac396be78188f94e4352a90ae07b646
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Sat Nov 10 13:22:41 2018 +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)
---
 Jenkinsfile | 14 +++++---------
 pom.xml     | 46 +++++++++++++++++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ceb179d..231aaa1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,11 +20,11 @@
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))])
 
 def buildOs = 'linux'
-def buildJdk = '8'
-def buildMvn = '3.5.4'
+def buildJdk = '11'
+def buildMvn = '3.6.0'
 def runITsOses = ['linux', 'windows']
-def runITsJdks = ['7', '8', '11']
-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 d504e02..b3f360b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
@@ -46,15 +46,16 @@ 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>
     <junitVersion>4.12</junitVersion>
     <mockitoVersion>2.21.0</mockitoVersion>
-    <plexusVersion>1.7.1</plexusVersion>
+    <plexusVersion>1.8-SNAPSHOT</plexusVersion>
     <plexusInterpolationVersion>1.25</plexusInterpolationVersion>
     <plexusUtilsVersion>3.1.0</plexusUtilsVersion>
     <guiceVersion>4.2.1</guiceVersion>
@@ -552,15 +553,23 @@ under the License.
     </pluginManagement>
     <plugins>
       <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M2</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.15</version>
         <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
-            <version>1.0</version>
-          </signature>
+          <skip>true</skip><!-- no rules for Java 11 yet -->
         </configuration>
         <executions>
           <execution>
@@ -687,5 +696,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>