You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/01/27 18:42:43 UTC
[maven] branch MNG-6512-build-11 updated (98332d4 -> c4d05d6)
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 98332d4 [MNG-6512] PoC - set minimum JDK to 11 to test compilation/test problems
add 732e7de [MNG-6529] ProjectBuilder.build(List<Project> ...) honor request.isResolveDependency
add c6bdafe [MNG-5965] Parallel build multiplies work if multiple goals are given
add 6c4c2e3 Change to keep only 5 artifacts on master and on branches only 1 artifact.
add c7ab987 [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
add 71128cb spelling: vertices
add 9c94626 [MNG-6213] Validate scope in dependencyManagement
add 391a111 [MNG-6526] Upgrade to Wagon 3.3.1
add eab62f1 [MNG-6520] Update namespaces for maven-assembly to 2.0.0
add 33e4f20 [MNG-6548] Lifecycle plugin version upgrades
add d9facde [MNG-6530] Introduce system property to disable global model cache
add a939654 [MNG-6256] Surround parameter of echo command with double quotes
add 8e5ecf0 fixed link (that goes to implementation in maven-core)
add 375cd7b [MNG-6559] Fix mailing list URL (#230)
add fdf5d92 renamed variables for better understanding
add 396291b [MNG-6069] Migrate to non deprecated parts of Commons CLI (#153)
add 2928dc6 refactoring: extracted initParent() method
add 049b7a7 refactoring: reduced try/catch scope
add ae1c32a [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
add 8b7055f [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
add 27332cf [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
add 24c762d [MNG-6533] catch InvalidArtifactRTException runtime exception
add bb3ec5d [MNG-5995] Remove dependency to maven-compat (#185)
add 7e3e545 [MNG-6573] Use Maven 3.6.0 for CI
add 15c6471 [MNG-6558] ToolchainsBuildingResult event is not sent on EventSpy
new 7a073dc [MNG-6543] Upgrade Plexus Classworlds to 2.6.0
new c4d05d6 [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 (98332d4)
\
N -- N -- N refs/heads/MNG-6512-build-11 (c4d05d6)
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 2 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:
CONTRIBUTING.md | 4 +-
Jenkinsfile | 6 +-
apache-maven/README.txt | 2 +-
apache-maven/src/bin/mvn.cmd | 4 +-
apache-maven/src/main/assembly/bin.xml | 4 +-
apache-maven/src/main/assembly/component.xml | 4 +-
apache-maven/src/main/assembly/dir.xml | 4 +-
apache-maven/src/main/assembly/src.xml | 4 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 100 +++++-
.../multithreaded/ConcurrencyDependencyGraph.java | 9 +-
.../multithreaded/MultiThreadedBuilder.java | 10 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 14 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 53 +--
.../maven/project/DefaultProjectBuilder.java | 382 ++++++++++++---------
.../project/DefaultProjectBuildingHelper.java | 6 +-
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../internal/ConcurrencyDependencyGraphTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 161 +++++++++
.../resources/projects/artifactMissingVersion.xml | 34 ++
.../pom.xml => resources/projects/badPom.xml} | 10 +-
.../projects/basic-resolveDependencies.xml | 15 +
.../main/java/org/apache/maven/cli/CLIManager.java | 124 ++++---
.../main/java/org/apache/maven/cli/MavenCli.java | 56 +--
.../java/org/apache/maven/cli/MavenCliTest.java | 42 ++-
.../model/validation/DefaultModelValidator.java | 10 +-
maven-model-builder/src/site/apt/index.apt | 4 +-
.../validation/DefaultModelValidatorTest.java | 10 +
...ier.xml => bad-dependency-management-scope.xml} | 38 +-
pom.xml | 24 +-
30 files changed, 814 insertions(+), 330 deletions(-)
create mode 100644 maven-core/src/test/resources/projects/artifactMissingVersion.xml
copy maven-core/src/test/{projects/default-maven/cyclic-reference/pom.xml => resources/projects/badPom.xml} (53%)
create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)
[maven] 01/02: [MNG-6543] Upgrade Plexus Classworlds to 2.6.0
Posted by sl...@apache.org.
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 7a073dc06b70ef1147fa648f355f613845907b17
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Dec 29 15:23:17 2018 +0100
[MNG-6543] Upgrade Plexus Classworlds to 2.6.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 054d47b..7057b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ under the License.
<maven.version>3.0.5</maven.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <classWorldsVersion>2.5.2</classWorldsVersion>
+ <classWorldsVersion>2.6.0</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.8.1</commonsLangVersion>
<junitVersion>4.12</junitVersion>
[maven] 02/02: [MNG-6512] PoC - set minimum JDK to 11 to test
compilation/test problems
Posted by sl...@apache.org.
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 c4d05d61ee7f904b4c0b47aadac34bf59a3bd358
Author: Sylwester Lachiewicz <sl...@apache.org>
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 | 10 +++-------
pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bcf5310..5fbdda5 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.0'
def runITsOses = ['linux', 'windows']
-def runITsJdks = ['7', '8', '11']
+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 7057b47..169a47d 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.6.0</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>
@@ -116,6 +117,16 @@ under the License.
</site>
</distributionManagement>
+ <repositories>
+ <!-- for plexus snapshots -->
+ <repository>
+ <id>sonatype-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<contributors>
<contributor>
<name>Stuart McCulloch</name>
@@ -542,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>
@@ -677,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>