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/05 19:56:56 UTC
[maven] branch MNG-6520 updated (20fc6a9 -> d34d56d)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6520
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 20fc6a9 [MNG-6520] Update headers for maven-assembly to 2.0.0
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
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
new d34d56d [MNG-6520] Update namespaces for maven-assembly to 2.0.0
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 (20fc6a9)
\
N -- N -- N refs/heads/MNG-6520 (d34d56d)
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:
Jenkinsfile | 2 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 9 +--
.../multithreaded/MultiThreadedBuilder.java | 10 +--
.../java/org/apache/maven/plugin/CacheUtils.java | 53 ++++++++-------
.../maven/project/DefaultProjectBuilder.java | 15 +++--
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../internal/ConcurrencyDependencyGraphTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 42 ++++++++++++
.../projects/basic-resolveDependencies.xml | 15 +++++
.../maven/model/building/DefaultModelBuilder.java | 3 +-
.../maven/model/building/FileModelSource.java | 23 +++++++
.../model/validation/DefaultModelValidator.java | 10 ++-
.../maven/model/building/FileModelSourceTest.java | 75 ++++++++++++++++++++++
.../validation/DefaultModelValidatorTest.java | 10 +++
...ier.xml => bad-dependency-management-scope.xml} | 38 ++++++++++-
pom.xml | 3 +
16 files changed, 270 insertions(+), 42 deletions(-)
create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)
[maven] 01/01: [MNG-6520] Update namespaces for maven-assembly to
2.0.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-6520
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d34d56d781be2058e3c026df398693695c0ac11b
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Wed Nov 8 00:55:36 2017 +0100
[MNG-6520] Update namespaces for maven-assembly to 2.0.0
---
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 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apache-maven/src/main/assembly/bin.xml b/apache-maven/src/main/assembly/bin.xml
index 79723c2..a04557d 100644
--- a/apache-maven/src/main/assembly/bin.xml
+++ b/apache-maven/src/main/assembly/bin.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>bin</id>
<formats>
<format>zip</format>
diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml
index 7b05af7..56b3f0b 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.3 http://maven.apache.org/xsd/component-1.1.3.xsd">
+<component xmlns="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY-COMPONENT/2.0.0 http://maven.apache.org/xsd/assembly-component-2.0.0.xsd">
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
diff --git a/apache-maven/src/main/assembly/dir.xml b/apache-maven/src/main/assembly/dir.xml
index 0d2b887..580b209 100644
--- a/apache-maven/src/main/assembly/dir.xml
+++ b/apache-maven/src/main/assembly/dir.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>dir</id>
<formats>
<format>dir</format>
diff --git a/apache-maven/src/main/assembly/src.xml b/apache-maven/src/main/assembly/src.xml
index fb0aee8..327ed52 100644
--- a/apache-maven/src/main/assembly/src.xml
+++ b/apache-maven/src/main/assembly/src.xml
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
under the License.
-->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>src</id>
<formats>
<format>zip</format>