[maven] branch MNG-7112-projects-with-non-recursive deleted (was 362b820)
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a change to branch MNG-7112-projects-with-non-recursive in repository https://gitbox.apache.org/repos/asf/maven.git. was 362b820 [MNG-7112] Do not select child modules when --non-recursive is given. This change permanently discards the following revisions: discard 362b820 [MNG-7112] Do not select child modules when --non-recursive is given.
[maven-integration-testing] branch MNG-7112-projects-with-non-recursive deleted (was 18b28d4)
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a change to branch MNG-7112-projects-with-non-recursive in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. was 18b28d4 [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project. This change permanently discards the following revisions: discard 18b28d4 [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project.
[maven-surefire] branch master updated: [githubci] setup timeout and jsk16 on *Nix systems
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 1e3bff6 [githubci] setup timeout and jsk16 on *Nix systems
1e3bff6 is described below
commit 1e3bff65588ff2833ca1656f5aedac51e66507f3
Author: Tibor Digana
AuthorDate: Fri Apr 2 20:49:28 2021 +0200
[githubci] setup timeout and jsk16 on *Nix systems
---
.github/workflows/maven-windows-it1.yml | 2 ++
.github/workflows/maven-windows-it2.yml | 2 ++
.github/workflows/maven.yml | 2 +-
.github/workflows/smoketest.yml | 6 --
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven-windows-it1.yml
b/.github/workflows/maven-windows-it1.yml
index 2f71a9f..1fac3d0 100644
--- a/.github/workflows/maven-windows-it1.yml
+++ b/.github/workflows/maven-windows-it1.yml
@@ -27,7 +27,9 @@ on:
jobs:
build:
+name: Build1 on Windows
runs-on: windows-latest
+timeout-minutes: 90
strategy:
fail-fast: false
diff --git a/.github/workflows/maven-windows-it2.yml
b/.github/workflows/maven-windows-it2.yml
index 25b5f2e..7faa862 100644
--- a/.github/workflows/maven-windows-it2.yml
+++ b/.github/workflows/maven-windows-it2.yml
@@ -27,7 +27,9 @@ on:
jobs:
build:
+name: Build2 on Windows
runs-on: windows-latest
+timeout-minutes: 90
strategy:
fail-fast: false
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index cc38513..16cc7aa 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
-java: [8, 11, 15]
+java: [8, 11, 16]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
index f8bbae2..e8a40b7 100644
--- a/.github/workflows/smoketest.yml
+++ b/.github/workflows/smoketest.yml
@@ -27,16 +27,18 @@ on:
jobs:
build:
+name: Build on MacOS
runs-on: macOS-latest
+timeout-minutes: 120
steps:
- name: Checkout
uses: actions/checkout@v1
- - name: Set up JDK 14
+ - name: Set up JDK 16
uses: actions/setup-java@v1
with:
- java-version: 14
+ java-version: 16
- name: Build with Maven
run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its
-DskipITs
[maven-release] branch master updated: [MRELEASE-1015] Add `signTag` option to release:prepare goal
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 8142302 [MRELEASE-1015] Add `signTag` option to release:prepare goal
8142302 is described below
commit 814230235034885d1d785f7e124452f12718d402
Author: Brian Demers
AuthorDate: Fri Apr 2 20:48:59 2021 +0200
[MRELEASE-1015] Add `signTag` option to release:prepare goal
Signed-off-by: rfscholte
---
.../maven/shared/release/config/ReleaseDescriptor.java | 7 +++
.../shared/release/config/ReleaseDescriptorBuilder.java | 6 ++
.../apache/maven/shared/release/phase/ScmTagPhase.java | 1 +
.../src/main/mdo/release-descriptor.mdo | 9 +
.../shared/release/phase/IsScmTagParametersEquals.java | 3 ++-
.../maven/shared/release/phase/ScmTagPhaseTest.java | 8 ++--
.../apache/maven/plugins/release/PrepareReleaseMojo.java | 9 +
.../maven/plugins/release/PrepareReleaseMojoTest.java| 16 +++-
8 files changed, 55 insertions(+), 4 deletions(-)
diff --git
a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index a482727..e8896cf 100644
---
a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++
b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -116,6 +116,13 @@ public interface ReleaseDescriptor
*/
boolean isRemoteTagging();
+
+/**
+ * Get if the scm provider should sign the tag. NOTE: currently only
implemented with git-exe.
+ * @return boolean true if SCM tag should be signed
+ */
+boolean isScmSignTags();
+
/**
* Get if the scm provider should use local checkouts via
file://${basedir} instead of doing a clean checkout over
* the network. This is very helpful for releasing large projects!
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
index 7ff677a..eb3c3f3 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -332,6 +332,12 @@ public class ReleaseDescriptorBuilder
return this;
}
+public ReleaseDescriptorBuilder setScmSignTags( boolean signTags )
+{
+releaseDescriptor.setScmSignTags( signTags );
+return this;
+}
+
public ReleaseDescriptorBuilder setScmUseEditMode( boolean scmUseEditMode )
{
releaseDescriptor.setScmUseEditMode( scmUseEditMode );
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
index b851852..7f96140 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
@@ -119,6 +119,7 @@ public class ScmTagPhase
ScmTagParameters scmTagParameters =
new ScmTagParameters( releaseDescriptor.getScmCommentPrefix()
+ "copy for tag " + tagName );
scmTagParameters.setRemoteTagging(
releaseDescriptor.isRemoteTagging() );
+scmTagParameters.setSign( releaseDescriptor.isScmSignTags() );
scmTagParameters.setScmRevision(
releaseDescriptor.getScmReleasedPomRevision() );
scmTagParameters.setPinExternals(
releaseDescriptor.isPinExternals() );
if ( getLogger().isDebugEnabled() )
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo
b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index ed0ea58..7a86868 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -595,6 +595,15 @@
+
+ scmSignTags
+ 3.0.0+
+ boolean
+
+If the scm provider should use sign tags, for example for git-exe
the '--sign' argument would be used.
+
+
+
[maven-release] branch MRELEASE-1062 deleted (was ad76020)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1062 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was ad76020 Adjust Jenkinsfile This change permanently discards the following revisions: discard ad76020 Adjust Jenkinsfile discard bf4bc25 [MRELEASE-1062] Require Java 8
[maven-release] branch MRELEASE-1015 created (now d1c7dd7)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1015 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at d1c7dd7 Add `signTag` option to release:prepare goal This branch includes the following new commits: new d1c7dd7 Add `signTag` option to release:prepare goal 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.
[maven-release] 01/01: Add `signTag` option to release:prepare goal
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1015
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit d1c7dd790c66a35ca33f62719c0ed0e05d51dcfd
Author: Brian Demers
AuthorDate: Fri Sep 28 13:28:21 2018 -0400
Add `signTag` option to release:prepare goal
---
.../maven/shared/release/config/ReleaseDescriptor.java | 7 +++
.../shared/release/config/ReleaseDescriptorBuilder.java | 6 ++
.../apache/maven/shared/release/phase/ScmTagPhase.java | 1 +
.../src/main/mdo/release-descriptor.mdo | 9 +
.../shared/release/phase/IsScmTagParametersEquals.java | 3 ++-
.../maven/shared/release/phase/ScmTagPhaseTest.java | 8 ++--
.../apache/maven/plugins/release/PrepareReleaseMojo.java | 9 +
.../maven/plugins/release/PrepareReleaseMojoTest.java| 16 +++-
8 files changed, 55 insertions(+), 4 deletions(-)
diff --git
a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
index a482727..e8896cf 100644
---
a/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
+++
b/maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java
@@ -116,6 +116,13 @@ public interface ReleaseDescriptor
*/
boolean isRemoteTagging();
+
+/**
+ * Get if the scm provider should sign the tag. NOTE: currently only
implemented with git-exe.
+ * @return boolean true if SCM tag should be signed
+ */
+boolean isScmSignTags();
+
/**
* Get if the scm provider should use local checkouts via
file://${basedir} instead of doing a clean checkout over
* the network. This is very helpful for releasing large projects!
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
index 7ff677a..eb3c3f3 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java
@@ -332,6 +332,12 @@ public class ReleaseDescriptorBuilder
return this;
}
+public ReleaseDescriptorBuilder setScmSignTags( boolean signTags )
+{
+releaseDescriptor.setScmSignTags( signTags );
+return this;
+}
+
public ReleaseDescriptorBuilder setScmUseEditMode( boolean scmUseEditMode )
{
releaseDescriptor.setScmUseEditMode( scmUseEditMode );
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
index b851852..7f96140 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
@@ -119,6 +119,7 @@ public class ScmTagPhase
ScmTagParameters scmTagParameters =
new ScmTagParameters( releaseDescriptor.getScmCommentPrefix()
+ "copy for tag " + tagName );
scmTagParameters.setRemoteTagging(
releaseDescriptor.isRemoteTagging() );
+scmTagParameters.setSign( releaseDescriptor.isScmSignTags() );
scmTagParameters.setScmRevision(
releaseDescriptor.getScmReleasedPomRevision() );
scmTagParameters.setPinExternals(
releaseDescriptor.isPinExternals() );
if ( getLogger().isDebugEnabled() )
diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo
b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index ed0ea58..7a86868 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -595,6 +595,15 @@
+
+ scmSignTags
+ 3.0.0+
+ boolean
+
+If the scm provider should use sign tags, for example for git-exe
the '--sign' argument would be used.
+
+
+
[maven] branch master updated: [MNG-7112] Do not select child modules when --non-recursive is given.
This is an automated email from the ASF dual-hosted git repository.
martinkanters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 7c742c2 [MNG-7112] Do not select child modules when --non-recursive
is given.
7c742c2 is described below
commit 7c742c298b60f60b1f8b92e43e4952ee128a4cd0
Author: Martin Kanters
AuthorDate: Mon Mar 22 11:39:09 2021 +0100
[MNG-7112] Do not select child modules when --non-recursive is given.
Closes #459
---
.../apache/maven/execution/ProjectActivation.java | 5 +
.../apache/maven/graph/DefaultGraphBuilder.java| 2 +-
.../project/collector/DefaultProjectsSelector.java | 5 +++--
.../maven/graph/DefaultGraphBuilderTest.java | 23 +++---
4 files changed, 29 insertions(+), 6 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
index 579ab18..a1d366c 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
@@ -199,4 +199,9 @@ public class ProjectActivation
{
this.activations.add( new ProjectActivationSettings( selector,
ActivationSettings.DEACTIVATION_OPTIONAL ) );
}
+
+public boolean isEmpty()
+{
+return this.activations.isEmpty();
+}
}
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 0dbd039..d1236e8 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -233,7 +233,7 @@ public class DefaultGraphBuilder
selectedProjects.add( selectedProject );
List children =
selectedProject.getCollectedProjects();
-if ( children != null )
+if ( children != null && request.isRecursive() )
{
selectedProjects.addAll( children );
}
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
index d341d0a..74be84a 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
@@ -60,8 +60,9 @@ public class DefaultProjectsSelector implements
ProjectsSelector
{
ProjectBuildingRequest projectBuildingRequest =
request.getProjectBuildingRequest();
-List results = projectBuilder.build( files,
request.isRecursive(),
-projectBuildingRequest );
+boolean hasProjectSelection =
!request.getProjectActivation().isEmpty();
+boolean isRecursive = hasProjectSelection || request.isRecursive();
+List results = projectBuilder.build( files,
isRecursive, projectBuildingRequest );
List projects = new ArrayList<>( results.size() );
diff --git
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 58885dd..8ff4711 100644
---
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -117,9 +117,13 @@ class DefaultGraphBuilderTest
scenario( "Selected project" )
.activeRequiredProjects( MODULE_B )
.expectResult( MODULE_B ),
-scenario( "Selected project (including child modules)" )
+scenario( "Selected aggregator project (including child
modules)" )
.activeRequiredProjects( MODULE_C )
.expectResult( MODULE_C, MODULE_C_1, MODULE_C_2 ),
+scenario( "Selected aggregator project with non-recursive" )
+.activeRequiredProjects( MODULE_C )
+.nonRecursive()
+.expectResult( MODULE_C ),
scenario( "Selected optional project" )
.activeOptionalProjects( MODULE_B )
.expectResult( MODULE_B ),
@@ -143,6 +147,10 @@ class DefaultGraphBuilderTest
.inactiveOptionalProjects( "non-existing-module" )
.inactiveRequiredProjects( MODULE_B )
.expectResult( PARENT_MODULE, MODULE_C, MODULE_C_1,
MODULE_A, MODULE_C_2, INDEPENDENT_MODULE ),
+scenario( "Excluded aggregator project with non-recursive" )
+
[maven-integration-testing] branch master updated: [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project.
This is an automated email from the ASF dual-hosted git repository.
martinkanters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 56f4d9e [MNG-7112] Test that --non-recursive can be used together
with --projects to just build the aggregator project.
56f4d9e is described below
commit 56f4d9e3b7dead4acb470ec42f124e0d34742878
Author: Martin Kanters
AuthorDate: Mon Mar 8 16:30:42 2021 +0100
[MNG-7112] Test that --non-recursive can be used together with --projects
to just build the aggregator project.
Closes #104
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 78 ++
.../aggregator-a/module-a/pom.xml | 44
.../aggregator-a/pom.xml | 50 ++
.../aggregator-b/module-b/pom.xml | 44
.../aggregator-b/pom.xml | 50 ++
.../mng-7112-projects-with-non-recursive/pom.xml | 73
7 files changed, 340 insertions(+)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 812541b..e2832ef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
// Tests that don't run stable and need to be fixed
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng7112ProjectsWithNonRecursiveTest.class );
suite.addTestSuite( MavenITmng7128BlockExternalHttpReactorTest.class );
suite.addTestSuite( MavenITmng6511OptionalProjectSelectionTest.class );
suite.addTestSuite( MavenITmng7110ExtensionClassloader.class );
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
new file mode 100644
index 000..da9d9d4
--- /dev/null
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
@@ -0,0 +1,78 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.io.IOException;
+
+public class MavenITmng7112ProjectsWithNonRecursiveTest
+extends AbstractMavenIntegrationTestCase
+{
+private static final String PROJECT_PATH =
"/mng-7112-projects-with-non-recursive";
+
+public MavenITmng7112ProjectsWithNonRecursiveTest()
+{
+super( "[4.0.0-alpha-1,)" );
+}
+
+public void testAggregatesCanBeBuiltNonRecursively()
+throws IOException, VerificationException
+{
+final File projectDir = ResourceExtractor.simpleExtractResources(
getClass(), PROJECT_PATH );
+newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
+
+final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
+
+verifier.addCliOption( "-pl" );
+verifier.addCliOption( ":aggregator-a,:aggregator-b" );
+verifier.addCliOption( "-N" );
+verifier.setLogFileName( "selected-non-recursive.txt" );
+verifier.executeGoal( "validate" );
+
+verifier.assertFileNotPresent( "target/touch.txt" );
+verifier.assertFilePresent( "aggregator-a/target/touch.txt" );
+verifier.assertFileNotPresent(
"aggregator-a/module-a/target/touch.txt" );
+verifier.assertFilePresent( "aggregator-b/target/touch.txt" );
+verifier.assertFileNotPresent(
"aggregator-b/module-b/target/touch.txt" );
+}
+
+public void testAggregatesCanBeDeselectedNonRecursively()
+throws
[maven-release] branch master updated: [MRELEASE-1062] Require Java 8
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new dc25df8 [MRELEASE-1062] Require Java 8 dc25df8 is described below commit dc25df898f987f787ea040e539e162536bc7d022 Author: rfscholte AuthorDate: Fri Apr 2 15:33:03 2021 +0200 [MRELEASE-1062] Require Java 8 --- Jenkinsfile| 2 +- .../shared/release/DefaultReleaseManagerTest.java | 9 ++-- .../release/exec/AbstractMavenExecutorTest.java| 52 +++--- .../release/exec/CommandLineFactoryTest.java | 2 - .../release/exec/ForkedMavenExecutorTest.java | 10 ++--- .../phase/CheckDependencySnapshotsPhaseTest.java | 6 +-- .../release/phase/IsScmBranchParametersEquals.java | 1 - .../shared/release/phase/MapVersionsPhaseTest.java | 20 - .../release/phase/RemoveScmTagPhaseTest.java | 49 +--- .../release/phase/RunCompleteGoalsPhaseTest.java | 16 +++ .../release/phase/RunPerformGoalsPhaseTest.java| 22 - .../release/phase/RunPrepareGoalsPhaseTest.java| 16 +++ .../phase/ScmCommitPreparationPhaseTest.java | 8 ++-- .../plugins/release/PrepareReleaseMojoTest.java| 5 +-- pom.xml| 2 +- 15 files changed, 101 insertions(+), 119 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e9f05f7..b4e13d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild() +asfMavenTlpPlgnBuild(jdk:['8','11','16']) diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java index bd11e2c..a9e5da5 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java @@ -19,8 +19,8 @@ package org.apache.maven.shared.release; * under the License. */ -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -30,7 +30,6 @@ import static org.mockito.Mockito.when; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -52,11 +51,9 @@ import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder; import org.apache.maven.shared.release.config.ReleaseDescriptorStore; import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException; import org.apache.maven.shared.release.config.ReleaseDescriptorStoreStub; -import org.apache.maven.shared.release.config.ReleaseUtils; import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.phase.ReleasePhase; import org.apache.maven.shared.release.phase.ReleasePhaseStub; -import org.apache.maven.shared.release.phase.RunPerformGoalsPhase; import org.apache.maven.shared.release.scm.ReleaseScmCommandException; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -596,7 +593,7 @@ public class DefaultReleaseManagerTest verify( managerListener, times( 5 ) ).phaseEnd(); // not part of actual test, but required to confirm 'no more interactions' -verify( managerListener ).goalStart( anyString(), any( List.class ) ); +verify( managerListener ).goalStart( anyString(), any() ); verify( managerListener ).goalEnd(); verifyNoMoreInteractions( managerListener ); diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java index 5b7f904..79bef7a 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java @@ -19,9 +19,9 @@ package org.apache.maven.shared.release.exec; * under the License. */ -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy;
[maven-release] branch MRELEASE-1062 updated: Adjust Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MRELEASE-1062 in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/MRELEASE-1062 by this push: new ad76020 Adjust Jenkinsfile ad76020 is described below commit ad76020e8f8772881f9fcc2e5d60b06f0696c6f2 Author: rfscholte AuthorDate: Fri Apr 2 15:07:44 2021 +0200 Adjust Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e9f05f7..b4e13d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild() +asfMavenTlpPlgnBuild(jdk:['8','11','16'])
[maven] 01/01: [MNG-7112] Do not select child modules when --non-recursive is given.
This is an automated email from the ASF dual-hosted git repository.
martinkanters pushed a commit to branch MNG-7112-projects-with-non-recursive
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 362b820797d76ac22d4be6d53f70592c987a5509
Author: Martin Kanters
AuthorDate: Mon Mar 22 11:39:09 2021 +0100
[MNG-7112] Do not select child modules when --non-recursive is given.
Closes #459
---
.../apache/maven/execution/ProjectActivation.java | 5 +
.../apache/maven/graph/DefaultGraphBuilder.java| 2 +-
.../project/collector/DefaultProjectsSelector.java | 5 +++--
.../maven/graph/DefaultGraphBuilderTest.java | 23 +++---
4 files changed, 29 insertions(+), 6 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
index 579ab18..a1d366c 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
@@ -199,4 +199,9 @@ public class ProjectActivation
{
this.activations.add( new ProjectActivationSettings( selector,
ActivationSettings.DEACTIVATION_OPTIONAL ) );
}
+
+public boolean isEmpty()
+{
+return this.activations.isEmpty();
+}
}
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 0dbd039..d1236e8 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -233,7 +233,7 @@ public class DefaultGraphBuilder
selectedProjects.add( selectedProject );
List children =
selectedProject.getCollectedProjects();
-if ( children != null )
+if ( children != null && request.isRecursive() )
{
selectedProjects.addAll( children );
}
diff --git
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
index d341d0a..74be84a 100644
---
a/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
+++
b/maven-core/src/main/java/org/apache/maven/project/collector/DefaultProjectsSelector.java
@@ -60,8 +60,9 @@ public class DefaultProjectsSelector implements
ProjectsSelector
{
ProjectBuildingRequest projectBuildingRequest =
request.getProjectBuildingRequest();
-List results = projectBuilder.build( files,
request.isRecursive(),
-projectBuildingRequest );
+boolean hasProjectSelection =
!request.getProjectActivation().isEmpty();
+boolean isRecursive = hasProjectSelection || request.isRecursive();
+List results = projectBuilder.build( files,
isRecursive, projectBuildingRequest );
List projects = new ArrayList<>( results.size() );
diff --git
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
index 58885dd..8ff4711 100644
---
a/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
@@ -117,9 +117,13 @@ class DefaultGraphBuilderTest
scenario( "Selected project" )
.activeRequiredProjects( MODULE_B )
.expectResult( MODULE_B ),
-scenario( "Selected project (including child modules)" )
+scenario( "Selected aggregator project (including child
modules)" )
.activeRequiredProjects( MODULE_C )
.expectResult( MODULE_C, MODULE_C_1, MODULE_C_2 ),
+scenario( "Selected aggregator project with non-recursive" )
+.activeRequiredProjects( MODULE_C )
+.nonRecursive()
+.expectResult( MODULE_C ),
scenario( "Selected optional project" )
.activeOptionalProjects( MODULE_B )
.expectResult( MODULE_B ),
@@ -143,6 +147,10 @@ class DefaultGraphBuilderTest
.inactiveOptionalProjects( "non-existing-module" )
.inactiveRequiredProjects( MODULE_B )
.expectResult( PARENT_MODULE, MODULE_C, MODULE_C_1,
MODULE_A, MODULE_C_2, INDEPENDENT_MODULE ),
+scenario( "Excluded aggregator project with non-recursive" )
+.inactiveRequiredProjects( MODULE_C )
+.nonRecursive()
+.expectResult( PARENT_MODULE, MODULE_C_1, MODULE_A,
MODULE_B,
[maven] branch MNG-7112-projects-with-non-recursive created (now 362b820)
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a change to branch MNG-7112-projects-with-non-recursive in repository https://gitbox.apache.org/repos/asf/maven.git. at 362b820 [MNG-7112] Do not select child modules when --non-recursive is given. This branch includes the following new commits: new 362b820 [MNG-7112] Do not select child modules when --non-recursive is given. 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.
[maven-integration-testing] 01/01: [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project.
This is an automated email from the ASF dual-hosted git repository.
martinkanters pushed a commit to branch MNG-7112-projects-with-non-recursive
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 18b28d42daea9d9d684d0a68e576ed0ffc3e06e8
Author: Martin Kanters
AuthorDate: Mon Mar 8 16:30:42 2021 +0100
[MNG-7112] Test that --non-recursive can be used together with --projects
to just build the aggregator project.
Closes #104
---
.../org/apache/maven/it/IntegrationTestSuite.java | 1 +
...MavenITmng7112ProjectsWithNonRecursiveTest.java | 78 ++
.../aggregator-a/module-a/pom.xml | 44
.../aggregator-a/pom.xml | 50 ++
.../aggregator-b/module-b/pom.xml | 44
.../aggregator-b/pom.xml | 50 ++
.../mng-7112-projects-with-non-recursive/pom.xml | 73
7 files changed, 340 insertions(+)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 812541b..e2832ef 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -106,6 +106,7 @@ public class IntegrationTestSuite
// Tests that don't run stable and need to be fixed
//
-
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite( MavenITmng7112ProjectsWithNonRecursiveTest.class );
suite.addTestSuite( MavenITmng7128BlockExternalHttpReactorTest.class );
suite.addTestSuite( MavenITmng6511OptionalProjectSelectionTest.class );
suite.addTestSuite( MavenITmng7110ExtensionClassloader.class );
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
new file mode 100644
index 000..da9d9d4
--- /dev/null
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7112ProjectsWithNonRecursiveTest.java
@@ -0,0 +1,78 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.io.IOException;
+
+public class MavenITmng7112ProjectsWithNonRecursiveTest
+extends AbstractMavenIntegrationTestCase
+{
+private static final String PROJECT_PATH =
"/mng-7112-projects-with-non-recursive";
+
+public MavenITmng7112ProjectsWithNonRecursiveTest()
+{
+super( "[4.0.0-alpha-1,)" );
+}
+
+public void testAggregatesCanBeBuiltNonRecursively()
+throws IOException, VerificationException
+{
+final File projectDir = ResourceExtractor.simpleExtractResources(
getClass(), PROJECT_PATH );
+newVerifier( projectDir.getAbsolutePath() ).executeGoal( "clean" );
+
+final Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
+
+verifier.addCliOption( "-pl" );
+verifier.addCliOption( ":aggregator-a,:aggregator-b" );
+verifier.addCliOption( "-N" );
+verifier.setLogFileName( "selected-non-recursive.txt" );
+verifier.executeGoal( "validate" );
+
+verifier.assertFileNotPresent( "target/touch.txt" );
+verifier.assertFilePresent( "aggregator-a/target/touch.txt" );
+verifier.assertFileNotPresent(
"aggregator-a/module-a/target/touch.txt" );
+verifier.assertFilePresent( "aggregator-b/target/touch.txt" );
+verifier.assertFileNotPresent(
"aggregator-b/module-b/target/touch.txt" );
+}
+
+public void testAggregatesCanBeDeselectedNonRecursively()
+throws IOException, VerificationException
+{
+final File projectDir = ResourceExtractor.simpleExtractResources(
getClass(), PROJECT_PATH );
+newVerifier( projectDir.getAbsolutePath()
[maven-integration-testing] branch MNG-7112-projects-with-non-recursive created (now 18b28d4)
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a change to branch MNG-7112-projects-with-non-recursive in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. at 18b28d4 [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project. This branch includes the following new commits: new 18b28d4 [MNG-7112] Test that --non-recursive can be used together with --projects to just build the aggregator project. 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.
svn commit: r1888301 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/mini/guide-wagon-providers.html == --- maven/website/content/guides/mini/guide-wagon-providers.html (original) +++ maven/website/content/guides/mini/guide-wagon-providers.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Selecting Alternative Wagon Providers https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-wagon-providers.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/mini/index.html == --- maven/website/content/guides/mini/index.html (original) +++ maven/website/content/guides/mini/index.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Mini Guides https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/index.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-plugin-development.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Olivier Lamy" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-plugin-development.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-report-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-report-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-report-plugin-development.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Bertrand Martin" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Report Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-report-plugin-development.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Apache Maven IDE Integration https://github.com/apache/maven-site/tree/master/content/markdown/ide.md;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/install.html == --- maven/website/content/install.html (original) +++ maven/website/content/install.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Installing Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/install.md.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified:
svn commit: r1888301 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.0/release-notes.html == --- maven/website/content/docs/2.0/release-notes.html (original) +++ maven/website/content/docs/2.0/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -40,7 +40,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.0 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.0/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/2.1.0/release-notes.html == --- maven/website/content/docs/2.1.0/release-notes.html (original) +++ maven/website/content/docs/2.1.0/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Brian Fox" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.1.0 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.1.0/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/2.2.0/release-notes.html == --- maven/website/content/docs/2.2.0/release-notes.html (original) +++ maven/website/content/docs/2.2.0/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ John Casey" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.0 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.0/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2021-03-30 +| Last Published:
svn commit: r1888301 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Fri Apr 2 12:21:01 2021 New Revision: 1888301 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html
svn commit: r1888301 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/development/guide-testing-development-plugins.html == --- maven/website/content/guides/development/guide-testing-development-plugins.html (original) +++ maven/website/content/guides/development/guide-testing-development-plugins.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Development Versions of Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-development-plugins.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/development/guide-testing-releases.html == --- maven/website/content/guides/development/guide-testing-releases.html (original) +++ maven/website/content/guides/development/guide-testing-releases.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Testing Staged Releases https://github.com/apache/maven-site/tree/master/content/apt/guides/development/guide-testing-releases.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/getting-started/index.html == --- maven/website/content/guides/getting-started/index.html (original) +++ maven/website/content/guides/getting-started/index.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Vincent Siveton" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Getting Started Guide https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/index.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/getting-started/maven-in-five-minutes.html == --- maven/website/content/guides/getting-started/maven-in-five-minutes.html (original) +++ maven/website/content/guides/getting-started/maven-in-five-minutes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven in 5 Minutes https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/maven-in-five-minutes.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm;> -| Last Published: 2021-03-30 +| Last Published: 2021-04-02 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Fri Apr 2 12:21:01 2021 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@
[maven-site] branch master updated: Add 'Introduction to Maven Toolchains' blog
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git The following commit(s) were added to refs/heads/master by this push: new 32a7993 Add 'Introduction to Maven Toolchains' blog new de87506 Merge pull request #232 from infosupport/add-blog-toolchains 32a7993 is described below commit 32a799362c143d06b23f1912c6c6e85a108f52e1 Author: Maarten Mulders AuthorDate: Fri Apr 2 13:31:02 2021 +0200 Add 'Introduction to Maven Toolchains' blog --- content/xdoc/articles.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/content/xdoc/articles.xml b/content/xdoc/articles.xml index 3fd622f..4926c33 100644 --- a/content/xdoc/articles.xml +++ b/content/xdoc/articles.xml @@ -91,6 +91,12 @@ under the License. Published +https://maarten.mulders.it/2021/03/introduction-to-maven-toolchains/;>Introduction to Maven Toolchains + +Maarten Mulders +March 2021 + + https://maarten.mulders.it/2020/01/customise-the-maven-release-process/;>Customise the Maven Release process Maarten Mulders
[maven-release] branch MRELEASE-1042 deleted (was f3ebecd)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1042 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was f3ebecd releaseProfiles get overriden by activeProfiles This change permanently discards the following revisions: discard f3ebecd releaseProfiles get overriden by activeProfiles
[maven-release] branch MRELEASE-1062 created (now bf4bc25)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1062 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at bf4bc25 [MRELEASE-1062] Require Java 8 This branch includes the following new commits: new bf4bc25 [MRELEASE-1062] Require Java 8 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.
[maven-release] 01/01: [MRELEASE-1062] Require Java 8
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MRELEASE-1062 in repository https://gitbox.apache.org/repos/asf/maven-release.git commit bf4bc25624ef316a9d39a9978cb920e5fe75da34 Author: rfscholte AuthorDate: Fri Apr 2 13:54:44 2021 +0200 [MRELEASE-1062] Require Java 8 --- .../shared/release/DefaultReleaseManagerTest.java | 9 ++-- .../release/exec/AbstractMavenExecutorTest.java| 52 +++--- .../release/exec/CommandLineFactoryTest.java | 2 - .../release/exec/ForkedMavenExecutorTest.java | 10 ++--- .../phase/CheckDependencySnapshotsPhaseTest.java | 6 +-- .../release/phase/IsScmBranchParametersEquals.java | 1 - .../shared/release/phase/MapVersionsPhaseTest.java | 20 - .../release/phase/RemoveScmTagPhaseTest.java | 49 +--- .../release/phase/RunCompleteGoalsPhaseTest.java | 16 +++ .../release/phase/RunPerformGoalsPhaseTest.java| 22 - .../release/phase/RunPrepareGoalsPhaseTest.java| 16 +++ .../phase/ScmCommitPreparationPhaseTest.java | 8 ++-- .../plugins/release/PrepareReleaseMojoTest.java| 5 +-- pom.xml| 2 +- 14 files changed, 100 insertions(+), 118 deletions(-) diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java index bd11e2c..a9e5da5 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java @@ -19,8 +19,8 @@ package org.apache.maven.shared.release; * under the License. */ -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -30,7 +30,6 @@ import static org.mockito.Mockito.when; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -52,11 +51,9 @@ import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder; import org.apache.maven.shared.release.config.ReleaseDescriptorStore; import org.apache.maven.shared.release.config.ReleaseDescriptorStoreException; import org.apache.maven.shared.release.config.ReleaseDescriptorStoreStub; -import org.apache.maven.shared.release.config.ReleaseUtils; import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.phase.ReleasePhase; import org.apache.maven.shared.release.phase.ReleasePhaseStub; -import org.apache.maven.shared.release.phase.RunPerformGoalsPhase; import org.apache.maven.shared.release.scm.ReleaseScmCommandException; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -596,7 +593,7 @@ public class DefaultReleaseManagerTest verify( managerListener, times( 5 ) ).phaseEnd(); // not part of actual test, but required to confirm 'no more interactions' -verify( managerListener ).goalStart( anyString(), any( List.class ) ); +verify( managerListener ).goalStart( anyString(), any() ); verify( managerListener ).goalEnd(); verifyNoMoreInteractions( managerListener ); diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java index 5b7f904..79bef7a 100644 --- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java +++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java @@ -19,9 +19,9 @@ package org.apache.maven.shared.release.exec; * under the License. */ -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,12 +31,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; - import org.apache.maven.shared.release.ReleaseResult; import org.apache.maven.shared.release.env.DefaultReleaseEnvironment; import org.apache.maven.shared.release.env.ReleaseEnvironment; +import junit.framework.TestCase; + public class
[maven-release] branch master updated: [MRELEASE-1042] releaseProfiles get overriden by activeProfiles
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new a553e19 [MRELEASE-1042] releaseProfiles get overriden by
activeProfiles
a553e19 is described below
commit a553e1921a3633848e8a886a0286bf45047b9ab5
Author: Benoit Guerin
AuthorDate: Fri Apr 2 13:10:09 2021 +0200
[MRELEASE-1042] releaseProfiles get overriden by activeProfiles
Signed-off-by: rfscholte
---
.../shared/release/DefaultReleaseManager.java | 28 +++---
.../shared/release/DefaultReleaseManagerTest.java | 2 +-
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index f023ab6..b449348 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release;
*/
import java.io.File;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
@@ -304,21 +305,26 @@ public class DefaultReleaseManager
ReleaseUtils.buildReleaseDescriptor(
performRequest.getReleaseDescriptorBuilder() )
.getActivateProfiles();
-ReleaseDescriptor releaseDescriptor =
-loadReleaseDescriptor(
performRequest.getReleaseDescriptorBuilder(),
- performRequest.getReleaseManagerListener()
);
+ReleaseDescriptorBuilder builder =
+loadReleaseDescriptorBuilder(
performRequest.getReleaseDescriptorBuilder(),
+
performRequest.getReleaseManagerListener() );
if ( specificProfiles != null && !specificProfiles.isEmpty() )
{
+List allProfiles = new ArrayList<>();
+allProfiles.addAll( ReleaseUtils.buildReleaseDescriptor( builder
).getActivateProfiles() );
for ( String specificProfile : specificProfiles )
{
-if ( !releaseDescriptor.getActivateProfiles().contains(
specificProfile ) )
+if ( !allProfiles.contains( specificProfile ) )
{
-releaseDescriptor.getActivateProfiles().add(
specificProfile );
+allProfiles.add( specificProfile );
}
}
+builder.setActivateProfiles( allProfiles );
}
+ReleaseDescriptor releaseDescriptor =
ReleaseUtils.buildReleaseDescriptor( builder );
+
Strategy releaseStrategy = getStrategy(
releaseDescriptor.getReleaseStrategyId() );
List performPhases = getGoalPhases( releaseStrategy, "perform"
);
@@ -522,12 +528,19 @@ public class DefaultReleaseManager
ReleaseManagerListener
listener )
throws ReleaseExecutionException
{
+return ReleaseUtils.buildReleaseDescriptor(
loadReleaseDescriptorBuilder( builder, listener ) );
+}
+
+private ReleaseDescriptorBuilder loadReleaseDescriptorBuilder(
ReleaseDescriptorBuilder builder,
+ ReleaseManagerListener
listener )
+throws ReleaseExecutionException
+{
try
{
updateListener( listener, "verify-release-configuration",
PHASE_START );
-BuilderReleaseDescriptor descriptor =
ReleaseUtils.buildReleaseDescriptor( configStore.read( builder ) );
+ReleaseDescriptorBuilder result = configStore.read( builder );
updateListener( listener, "verify-release-configuration",
PHASE_END );
-return descriptor;
+return result;
}
catch ( ReleaseDescriptorStoreException e )
{
@@ -537,7 +550,6 @@ public class DefaultReleaseManager
}
}
-
protected void clean( AbstractReleaseRequest releaseRequest ) throws
ReleaseFailureException
{
ReleaseCleanRequest cleanRequest = new ReleaseCleanRequest();
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 8e024d0..bd11e2c 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -725,7 +725,7 @@ public class DefaultReleaseManagerTest
DefaultReleaseManager releaseManager = (DefaultReleaseManager)
[maven-release] branch MRELEASE-1042 created (now f3ebecd)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-1042 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at f3ebecd releaseProfiles get overriden by activeProfiles This branch includes the following new commits: new f3ebecd releaseProfiles get overriden by activeProfiles 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.
[maven-release] 01/01: releaseProfiles get overriden by activeProfiles
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MRELEASE-1042
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit f3ebecd91cc5d4fa038fcea1655614fae79b01d1
Author: Benoit Guerin
AuthorDate: Mon May 18 23:39:04 2020 +0200
releaseProfiles get overriden by activeProfiles
Fix UnsupportedOperationException when altering
releaseDescriptor.activateProfiles
---
.../shared/release/DefaultReleaseManager.java | 28 +++---
.../shared/release/DefaultReleaseManagerTest.java | 2 +-
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index f023ab6..b449348 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -20,6 +20,7 @@ package org.apache.maven.shared.release;
*/
import java.io.File;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
@@ -304,21 +305,26 @@ public class DefaultReleaseManager
ReleaseUtils.buildReleaseDescriptor(
performRequest.getReleaseDescriptorBuilder() )
.getActivateProfiles();
-ReleaseDescriptor releaseDescriptor =
-loadReleaseDescriptor(
performRequest.getReleaseDescriptorBuilder(),
- performRequest.getReleaseManagerListener()
);
+ReleaseDescriptorBuilder builder =
+loadReleaseDescriptorBuilder(
performRequest.getReleaseDescriptorBuilder(),
+
performRequest.getReleaseManagerListener() );
if ( specificProfiles != null && !specificProfiles.isEmpty() )
{
+List allProfiles = new ArrayList<>();
+allProfiles.addAll( ReleaseUtils.buildReleaseDescriptor( builder
).getActivateProfiles() );
for ( String specificProfile : specificProfiles )
{
-if ( !releaseDescriptor.getActivateProfiles().contains(
specificProfile ) )
+if ( !allProfiles.contains( specificProfile ) )
{
-releaseDescriptor.getActivateProfiles().add(
specificProfile );
+allProfiles.add( specificProfile );
}
}
+builder.setActivateProfiles( allProfiles );
}
+ReleaseDescriptor releaseDescriptor =
ReleaseUtils.buildReleaseDescriptor( builder );
+
Strategy releaseStrategy = getStrategy(
releaseDescriptor.getReleaseStrategyId() );
List performPhases = getGoalPhases( releaseStrategy, "perform"
);
@@ -522,12 +528,19 @@ public class DefaultReleaseManager
ReleaseManagerListener
listener )
throws ReleaseExecutionException
{
+return ReleaseUtils.buildReleaseDescriptor(
loadReleaseDescriptorBuilder( builder, listener ) );
+}
+
+private ReleaseDescriptorBuilder loadReleaseDescriptorBuilder(
ReleaseDescriptorBuilder builder,
+ ReleaseManagerListener
listener )
+throws ReleaseExecutionException
+{
try
{
updateListener( listener, "verify-release-configuration",
PHASE_START );
-BuilderReleaseDescriptor descriptor =
ReleaseUtils.buildReleaseDescriptor( configStore.read( builder ) );
+ReleaseDescriptorBuilder result = configStore.read( builder );
updateListener( listener, "verify-release-configuration",
PHASE_END );
-return descriptor;
+return result;
}
catch ( ReleaseDescriptorStoreException e )
{
@@ -537,7 +550,6 @@ public class DefaultReleaseManager
}
}
-
protected void clean( AbstractReleaseRequest releaseRequest ) throws
ReleaseFailureException
{
ReleaseCleanRequest cleanRequest = new ReleaseCleanRequest();
diff --git
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 8e024d0..bd11e2c 100644
---
a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++
b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -725,7 +725,7 @@ public class DefaultReleaseManagerTest
DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup(
ReleaseManager.class, "test" );
ReleaseDescriptorBuilder secondBuilder = new
ReleaseDescriptorBuilder();
-
[maven-integration-testing] branch master updated: [MNG-7045] Make sure Groovy 4.0.0-alpha-2 is available
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git The following commit(s) were added to refs/heads/master by this push: new 39a2071 [MNG-7045] Make sure Groovy 4.0.0-alpha-2 is available 39a2071 is described below commit 39a2071ffc68e6f2908609fc8deef54bb30f5f39 Author: Maarten Mulders AuthorDate: Fri Apr 2 11:48:55 2021 +0200 [MNG-7045] Make sure Groovy 4.0.0-alpha-2 is available --- core-it-suite/src/test/resources/bootstrap/group-11/pom.xml | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml b/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml index 3442b61..6930046 100644 --- a/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml +++ b/core-it-suite/src/test/resources/bootstrap/group-11/pom.xml @@ -50,9 +50,16 @@ under the License. 1.3 - org.codehaus.groovy + org.apache.groovy + groovy-ant + 4.0.0-alpha-2 + runtime + + + org.apache.groovy groovy - 3.0.7 + 4.0.0-alpha-2 + runtime org.codehaus.gmavenplus
[maven-archetype] branch master updated: Fix typo (#63)
This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-archetype.git The following commit(s) were added to refs/heads/master by this push: new 6d280d1 Fix typo (#63) 6d280d1 is described below commit 6d280d107c80bc8851963b14ecaab21016e26e88 Author: Laurent Magnien AuthorDate: Fri Apr 2 11:37:00 2021 +0200 Fix typo (#63) --- .../src/site/apt/examples/create-with-property-file.apt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-archetype-plugin/src/site/apt/examples/create-with-property-file.apt b/maven-archetype-plugin/src/site/apt/examples/create-with-property-file.apt index fb8c2ec..940c086 100644 --- a/maven-archetype-plugin/src/site/apt/examples/create-with-property-file.apt +++ b/maven-archetype-plugin/src/site/apt/examples/create-with-property-file.apt @@ -267,10 +267,10 @@ public class App When undefined, the <<>> and <<>> properties are given sensible default values: -* <<>> have: <<>> have: <<>>. Notice the dotted filtered extensions that contains the complete file names. -* <<>> have: <<>>. +* <<>> have: <<>>. -[] \ No newline at end of file +[]
[maven-release] branch mavenproject2model deleted (was 6d4f196)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch mavenproject2model in repository https://gitbox.apache.org/repos/asf/maven-release.git. was 6d4f196 Unsure pomless perform still works The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-release] branch pplex1 deleted (was 9ce1339)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch pplex1 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was 9ce1339 3.0.19 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-release] branch deps2 deleted (was e68b540)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch deps2 in repository https://gitbox.apache.org/repos/asf/maven-release.git. was e68b540 update xmlunit This change permanently discards the following revisions: discard e68b540 update xmlunit
[maven] 03/05: [MNG-7112] Describe behaviour when --projects and --non-recursive are combined
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git commit 1397a741a805e4e2758f4600cc112619054d9664 Author: Martin Kanters AuthorDate: Fri Apr 2 10:51:32 2021 +0200 [MNG-7112] Describe behaviour when --projects and --non-recursive are combined --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index 3db3f26..3dcabb3 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -121,7 +121,7 @@ public class CLIManager options.addOption( Option.builder( Character.toString( QUIET ) ).longOpt( "quiet" ).desc( "Quiet output - only show errors" ).build() ); options.addOption( Option.builder( Character.toString( DEBUG ) ).longOpt( "debug" ).desc( "Produce execution debug output" ).build() ); options.addOption( Option.builder( Character.toString( ERRORS ) ).longOpt( "errors" ).desc( "Produce execution error messages" ).build() ); -options.addOption( Option.builder( Character.toString( NON_RECURSIVE ) ).longOpt( "non-recursive" ).desc( "Do not recurse into sub-projects" ).build() ); +options.addOption( Option.builder( Character.toString( NON_RECURSIVE ) ).longOpt( "non-recursive" ).desc( "Do not recurse into sub-projects. When used together with -pl, do not recurse into sub-projects of selected aggregators" ).build() ); options.addOption( Option.builder( Character.toString( UPDATE_SNAPSHOTS ) ).longOpt( "update-snapshots" ).desc( "Forces a check for missing releases and updated snapshots on remote repositories" ).build() ); options.addOption( Option.builder( Character.toString( ACTIVATE_PROFILES ) ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate. Prefixing a profile with ! excludes it, and ? marks it as optional" ).hasArg().build() ); options.addOption( Option.builder( Character.toString( BATCH_MODE ) ).longOpt( "batch-mode" ).desc( "Run in non-interactive (batch) mode (disables output color)" ).build() );
[maven] 01/05: [MNG-6511] Describe prefixes for --projects/-pl
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git commit 3d4f81583cd3c1951ffa8d409c536cfec5b8003f Author: Martin Kanters AuthorDate: Fri Apr 2 10:47:52 2021 +0200 [MNG-6511] Describe prefixes for --projects/-pl --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index d194180..8b0d74e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -138,7 +138,7 @@ public class CLIManager options.addOption( Option.builder( FAIL_NEVER ).longOpt( "fail-never" ).desc( "NEVER fail the build, regardless of project result" ).build() ); options.addOption( Option.builder( RESUME ).longOpt( "resume" ).desc( "Resume reactor from the last failed project, using the resume.properties file in the build directory " ).build() ); options.addOption( Option.builder( RESUME_FROM ).longOpt( "resume-from" ).hasArg().desc( "Resume reactor from specified project" ).build() ); -options.addOption( Option.builder( PROJECT_LIST ).longOpt( "projects" ).desc( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path" ).hasArg().build() ); +options.addOption( Option.builder( PROJECT_LIST ).longOpt( "projects" ).desc( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path. Prefixing a project with ! excludes it, and ? marks it as optional" ).hasArg().build() ); options.addOption( Option.builder( ALSO_MAKE ).longOpt( "also-make" ).desc( "If project list is specified, also build projects required by the list" ).build() ); options.addOption( Option.builder( ALSO_MAKE_DEPENDENTS ).longOpt( "also-make-dependents" ).desc( "If project list is specified, also build projects that depend on projects on the list" ).build() ); options.addOption( Option.builder( LOG_FILE ).longOpt( "log-file" ).hasArg().desc( "Log file where all build output will go (disables output color)" ).build() );
[maven] branch extend-mvn-help-text created (now e189b91)
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a change to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git. at e189b91 Fix typo in constant This branch includes the following new commits: new 3d4f815 [MNG-6511] Describe prefixes for --projects/-pl new 089a029 [MNG-7051] Describe prefixes for --activate-profiles/-P new 1397a74 [MNG-7112] Describe behaviour when --projects and --non-recursive are combined new bd77e3d Remove dangling space in resume help text new e189b91 Fix typo in constant The 5 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.
[maven] 05/05: Fix typo in constant
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git commit e189b918ad778a46f357d76549c96c2a58fb68e7 Author: Martin Kanters AuthorDate: Fri Apr 2 10:54:07 2021 +0200 Fix typo in constant --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 4 ++-- maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index 220b3a2..4d823a2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -61,7 +61,7 @@ public class CLIManager public static final char ACTIVATE_PROFILES = 'P'; -public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; +public static final String SUPPRESS_SNAPSHOT_UPDATES = "nsu"; public static final char CHECKSUM_FAILURE_POLICY = 'C'; @@ -125,7 +125,7 @@ public class CLIManager options.addOption( Option.builder( Character.toString( UPDATE_SNAPSHOTS ) ).longOpt( "update-snapshots" ).desc( "Forces a check for missing releases and updated snapshots on remote repositories" ).build() ); options.addOption( Option.builder( Character.toString( ACTIVATE_PROFILES ) ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate. Prefixing a profile with ! excludes it, and ? marks it as optional" ).hasArg().build() ); options.addOption( Option.builder( Character.toString( BATCH_MODE ) ).longOpt( "batch-mode" ).desc( "Run in non-interactive (batch) mode (disables output color)" ).build() ); -options.addOption( Option.builder( SUPRESS_SNAPSHOT_UPDATES ).longOpt( "no-snapshot-updates" ).desc( "Suppress SNAPSHOT updates" ).build() ); +options.addOption( Option.builder( SUPPRESS_SNAPSHOT_UPDATES ).longOpt( "no-snapshot-updates" ).desc( "Suppress SNAPSHOT updates" ).build() ); options.addOption( Option.builder( Character.toString( CHECKSUM_FAILURE_POLICY ) ).longOpt( "strict-checksums" ).desc( "Fail the build if checksums don't match" ).build() ); options.addOption( Option.builder( Character.toString( CHECKSUM_WARNING_POLICY ) ).longOpt( "lax-checksums" ).desc( "Warn if checksums don't match" ).build() ); options.addOption( Option.builder( Character.toString( ALTERNATE_USER_SETTINGS ) ).longOpt( "settings" ).desc( "Alternate path for the user settings file" ).hasArg().build() ); diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index c3dc3b7..5bdb040 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -1356,7 +1356,7 @@ public class MavenCli File baseDirectory = new File( workingDirectory, "" ).getAbsoluteFile(); disableOnPresentOption( commandLine, CLIManager.BATCH_MODE, request::setInteractiveMode ); -enableOnPresentOption( commandLine, CLIManager.SUPRESS_SNAPSHOT_UPDATES, request::setNoSnapshotUpdates ); +enableOnPresentOption( commandLine, CLIManager.SUPPRESS_SNAPSHOT_UPDATES, request::setNoSnapshotUpdates ); request.setGoals( commandLine.getArgList() ); request.setReactorFailureBehavior( determineReactorFailureBehaviour ( commandLine ) ); disableOnPresentOption( commandLine, CLIManager.NON_RECURSIVE, request::setRecursive );
[maven] 04/05: Remove dangling space in resume help text
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git commit bd77e3d23f00a67caaf33b2a1cd8628756240829 Author: Martin Kanters AuthorDate: Fri Apr 2 10:52:16 2021 +0200 Remove dangling space in resume help text --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index 3dcabb3..220b3a2 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -136,7 +136,7 @@ public class CLIManager options.addOption( Option.builder( FAIL_FAST ).longOpt( "fail-fast" ).desc( "Stop at first failure in reactorized builds" ).build() ); options.addOption( Option.builder( FAIL_AT_END ).longOpt( "fail-at-end" ).desc( "Only fail the build afterwards; allow all non-impacted builds to continue" ).build() ); options.addOption( Option.builder( FAIL_NEVER ).longOpt( "fail-never" ).desc( "NEVER fail the build, regardless of project result" ).build() ); -options.addOption( Option.builder( RESUME ).longOpt( "resume" ).desc( "Resume reactor from the last failed project, using the resume.properties file in the build directory " ).build() ); +options.addOption( Option.builder( RESUME ).longOpt( "resume" ).desc( "Resume reactor from the last failed project, using the resume.properties file in the build directory" ).build() ); options.addOption( Option.builder( RESUME_FROM ).longOpt( "resume-from" ).hasArg().desc( "Resume reactor from specified project" ).build() ); options.addOption( Option.builder( PROJECT_LIST ).longOpt( "projects" ).desc( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path. Prefixing a project with ! excludes it, and ? marks it as optional" ).hasArg().build() ); options.addOption( Option.builder( ALSO_MAKE ).longOpt( "also-make" ).desc( "If project list is specified, also build projects required by the list" ).build() );
[maven] 02/05: [MNG-7051] Describe prefixes for --activate-profiles/-P
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch extend-mvn-help-text in repository https://gitbox.apache.org/repos/asf/maven.git commit 089a029f89060be09a622ef7efb5468c08dddbbf Author: Martin Kanters AuthorDate: Fri Apr 2 10:49:22 2021 +0200 [MNG-7051] Describe prefixes for --activate-profiles/-P --- maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index 8b0d74e..3db3f26 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -123,7 +123,7 @@ public class CLIManager options.addOption( Option.builder( Character.toString( ERRORS ) ).longOpt( "errors" ).desc( "Produce execution error messages" ).build() ); options.addOption( Option.builder( Character.toString( NON_RECURSIVE ) ).longOpt( "non-recursive" ).desc( "Do not recurse into sub-projects" ).build() ); options.addOption( Option.builder( Character.toString( UPDATE_SNAPSHOTS ) ).longOpt( "update-snapshots" ).desc( "Forces a check for missing releases and updated snapshots on remote repositories" ).build() ); -options.addOption( Option.builder( Character.toString( ACTIVATE_PROFILES ) ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate" ).hasArg().build() ); +options.addOption( Option.builder( Character.toString( ACTIVATE_PROFILES ) ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate. Prefixing a profile with ! excludes it, and ? marks it as optional" ).hasArg().build() ); options.addOption( Option.builder( Character.toString( BATCH_MODE ) ).longOpt( "batch-mode" ).desc( "Run in non-interactive (batch) mode (disables output color)" ).build() ); options.addOption( Option.builder( SUPRESS_SNAPSHOT_UPDATES ).longOpt( "no-snapshot-updates" ).desc( "Suppress SNAPSHOT updates" ).build() ); options.addOption( Option.builder( Character.toString( CHECKSUM_FAILURE_POLICY ) ).longOpt( "strict-checksums" ).desc( "Fail the build if checksums don't match" ).build() );
[maven] branch MNG-7134 updated (abd2858 -> 3a65353)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git. from abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories add 3a65353 adjusting @since No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/artifact/repository/ArtifactRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven] 05/05: [MNG-7128] keep blocked attribute from mirrors in artifact repositories
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit abd28587994ac011754ca43657867bee18d04bf3
Author: Hervé Boutemy
AuthorDate: Thu Mar 25 23:51:26 2021 +0100
[MNG-7128] keep blocked attribute from mirrors in artifact repositories
---
.../maven/artifact/repository/ArtifactRepository.java | 6 ++
.../artifact/repository/DefaultArtifactRepository.java | 12
.../maven/repository/legacy/LegacyRepositorySystem.java| 5 +
.../src/main/java/org/apache/maven/RepositoryUtils.java| 1 +
.../artifact/repository/LegacyLocalRepositoryManager.java | 9 +
.../maven/artifact/repository/MavenArtifactRepository.java | 14 ++
.../org/apache/maven/bridge/MavenRepositorySystem.java | 5 +
7 files changed, 52 insertions(+)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 0b33345..47839ea 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -73,6 +73,12 @@ public interface ArtifactRepository
@Deprecated
void setBlacklisted( boolean blackListed );
+/** @since 3.8.1 **/
+boolean isBlocked();
+
+/** @since 3.8.1 **/
+void setBlocked( boolean blocked );
+
//
// New interface methods for the repository system.
//
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index 16b82c5..ef487b8 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -54,6 +54,8 @@ public class DefaultArtifactRepository
private List mirroredRepositories =
Collections.emptyList();
+private boolean blocked;
+
/**
* Create a local repository or a test repository.
*
@@ -264,4 +266,14 @@ public class DefaultArtifactRepository
}
}
+public boolean isBlocked()
+{
+return blocked;
+}
+
+public void setBlocked( boolean blocked )
+{
+this.blocked = blocked;
+}
+
}
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index e3e7781..fd62e6c 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -446,6 +446,8 @@ public class LegacyRepositorySystem
effectiveRepository.setMirroredRepositories( mirroredRepos );
+effectiveRepository.setBlocked( aliasedRepo.isBlocked() );
+
effectiveRepositories.add( effectiveRepository );
}
@@ -502,6 +504,7 @@ public class LegacyRepositorySystem
mirror.setId( repo.getId() );
mirror.setUrl( repo.getUrl() );
mirror.setLayout( repo.getContentType() );
+mirror.setBlocked( repo.isBlocked() );
return mirror;
}
}
@@ -538,6 +541,8 @@ public class LegacyRepositorySystem
{
repository.setLayout( getLayout( mirror.getLayout() ) );
}
+
+repository.setBlocked( mirror.isBlocked() );
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index c1e21c4..80e5874 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -210,6 +210,7 @@ public class RepositoryUtils
builder.setAuthentication( toAuthentication(
repo.getAuthentication() ) );
builder.setProxy( toProxy( repo.getProxy() ) );
builder.setMirroredRepositories( toRepos(
repo.getMirroredRepositories() ) );
+builder.setBlocked( repo.isBlocked() );
result = builder.build();
}
return result;
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 634b63c..acd7d5f 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++
[maven] 04/05: [MNG-7117] add support for blocked mirror
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3e4565774efeb098e8cfbbd6ccb1838517474d4a
Author: Hervé Boutemy
AuthorDate: Sat Mar 13 18:00:59 2021 +0100
[MNG-7117] add support for blocked mirror
---
.../aether/DefaultRepositorySystemSessionFactory.java | 4 ++--
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo| 13 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 248a3b6..bda467c 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -177,8 +177,8 @@ public class DefaultRepositorySystemSessionFactory
DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
for ( Mirror mirror : request.getMirrors() )
{
-mirrorSelector.add( mirror.getId(), mirror.getUrl(),
mirror.getLayout(), false, mirror.getMirrorOf(),
-mirror.getMirrorOfLayouts() );
+mirrorSelector.add( mirror.getId(), mirror.getUrl(),
mirror.getLayout(), false, mirror.isBlocked(),
+mirror.getMirrorOf(),
mirror.getMirrorOfLayouts() );
}
session.setMirrorSelector( mirrorSelector );
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 86a017c..ac21538 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -46,7 +46,7 @@ under the License.
org.codehaus.modello
modello-maven-plugin
- 1.1.0
+ 1.2.0
src/main/mdo/settings.mdo
diff --git a/maven-settings/src/main/mdo/settings.mdo
b/maven-settings/src/main/mdo/settings.mdo
index 333d8bd..b0498df 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -633,6 +633,15 @@
of the mirror to repositories with a matching layout (apart from a
matching id). Since Maven 3.
+
+ blocked
+ 1.2.0+
+ boolean
+ false
+
+Whether this mirror should be blocked from any download request
but fail the download process, explaining why.
+
+
@@ -648,6 +657,10 @@
sb.append( ",mirrorOf=" ).append( mirrorOf );
sb.append( ",url=" ).append( this.url );
sb.append( ",name=" ).append( this.name );
+if ( isBlocked() )
+{
+sb.append( ",blocked" );
+}
sb.append( "]" );
return sb.toString();
}
[maven] 01/05: [MNG-7119] Upgrade Maven Wagon to 3.4.3
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git commit fa46195ab497263a7a12663274057b22b68d8281 Author: Michael Osipov AuthorDate: Tue Mar 16 18:22:04 2021 +0100 [MNG-7119] Upgrade Maven Wagon to 3.4.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1a1ab8..15b3021 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ under the License. 3.2.1 4.2.1 0.3.4 -3.3.4 +3.4.3 1.12.1 1.4 1.7
[maven] 02/05: use Maven Resolver 1.6.2
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git commit 0bb649314f3d3ab58800c9a20d2ea2a43d50d5ae Author: Hervé Boutemy AuthorDate: Sun Mar 14 20:52:42 2021 +0100 use Maven Resolver 1.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15b3021..18d0ac9 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.7 1.11 1.3 -1.4.1 +1.6.2 1.7.29 2.2.1 1.7.4
[maven] branch MNG-7134 created (now abd2858)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git. at abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories This branch includes the following new commits: new fa46195 [MNG-7119] Upgrade Maven Wagon to 3.4.3 new 0bb6493 use Maven Resolver 1.6.2 new ec02e31 [MNG-7116] add support for mirrorOf external:http:* new 3e45657 [MNG-7117] add support for blocked mirror new abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories The 5 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.
[maven] 03/05: [MNG-7116] add support for mirrorOf external:http:*
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ec02e31f5d457fcdb94731579fcd9554edd2
Author: Hervé Boutemy
AuthorDate: Sat Mar 13 18:40:48 2021 +0100
[MNG-7116] add support for mirrorOf external:http:*
---
.../maven/repository/DefaultMirrorSelector.java| 51 +++---
.../apache/maven/bridge/MavenRepositorySystem.java | 48 ++--
2 files changed, 89 insertions(+), 10 deletions(-)
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
index 6fa2c55..adb562a 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
@@ -41,6 +41,8 @@ public class DefaultMirrorSelector
private static final String EXTERNAL_WILDCARD = "external:*";
+private static final String EXTERNAL_HTTP_WILDCARD = "external:http:*";
+
public Mirror getMirror( ArtifactRepository repository, List
mirrors )
{
String repoId = repository.getId();
@@ -68,9 +70,14 @@ public class DefaultMirrorSelector
}
/**
- * This method checks if the pattern matches the originalRepository. Valid
patterns: * =
- * everything external:* = everything not on the localhost and not file
based. repo,repo1 = repo
- * or repo1 *,!repo1 = everything except repo1
+ * This method checks if the pattern matches the originalRepository. Valid
patterns:
+ *
+ * {@code *} = everything,
+ * {@code external:*} = everything not on the localhost and not file
based,
+ * {@code external:http:*} = any repository not on the localhost using
HTTP,
+ * {@code repo,repo1} = {@code repo} or {@code repo1},
+ * {@code *,!repo1} = everything except {@code repo1}.
+ *
*
* @param originalRepository to compare for a match.
* @param pattern used for match. Currently only '*' is supported.
@@ -115,6 +122,12 @@ public class DefaultMirrorSelector
result = true;
// don't stop processing in case a future segment
explicitly excludes this repo
}
+// check for external:http:*
+else if ( EXTERNAL_HTTP_WILDCARD.equals( repo ) &&
isExternalHttpRepo( originalRepository ) )
+{
+result = true;
+// don't stop processing in case a future segment
explicitly excludes this repo
+}
else if ( WILDCARD.equals( repo ) )
{
result = true;
@@ -136,8 +149,34 @@ public class DefaultMirrorSelector
try
{
URL url = new URL( originalRepository.getUrl() );
-return !( url.getHost().equals( "localhost" ) ||
url.getHost().equals( "127.0.0.1" )
-|| url.getProtocol().equals( "file" ) );
+return !( isLocal( url.getHost() ) || url.getProtocol().equals(
"file" ) );
+}
+catch ( MalformedURLException e )
+{
+// bad url just skip it here. It should have been validated
already, but the wagon lookup will deal with it
+return false;
+}
+}
+
+private static boolean isLocal( String host )
+{
+return "localhost".equals( host ) || "127.0.0.1".equals( host );
+}
+
+/**
+ * Checks the URL to see if this repository refers to a non-localhost
repository using HTTP.
+ *
+ * @param originalRepository
+ * @return true if external.
+ */
+static boolean isExternalHttpRepo( ArtifactRepository originalRepository )
+{
+try
+{
+URL url = new URL( originalRepository.getUrl() );
+return ( "http".equalsIgnoreCase( url.getProtocol() ) ||
"dav".equalsIgnoreCase( url.getProtocol() )
+|| "dav:http".equalsIgnoreCase( url.getProtocol() )
+|| "dav+http".equalsIgnoreCase( url.getProtocol() ) ) &&
!isLocal( url.getHost() );
}
catch ( MalformedURLException e )
{
@@ -146,7 +185,7 @@ public class DefaultMirrorSelector
}
}
-static boolean matchesLayout( ArtifactRepository repository, Mirror mirror
)
+ static boolean matchesLayout( ArtifactRepository repository, Mirror mirror )
{
return matchesLayout( RepositoryUtils.getLayout( repository ),
mirror.getMirrorOfLayouts() );
}
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 730b428..90bfdcd 100644
---
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++
[maven-integration-testing] branch master updated: [MNG-7045] Upgrade to IT to use Groovy 4.0.0-alpha-2
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 8f2aacb [MNG-7045] Upgrade to IT to use Groovy 4.0.0-alpha-2
8f2aacb is described below
commit 8f2aacb2924e5eff15a57b0938b39e6df0d4ece6
Author: Maarten Mulders
AuthorDate: Wed Mar 31 18:51:59 2021 +0200
[MNG-7045] Upgrade to IT to use Groovy 4.0.0-alpha-2
Closes #105.
---
.../it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java | 4 ++--
core-it-suite/src/test/resources/mng7045/pom.xml | 12 +---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
index b36f25c..d1e6661 100644
---
a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
+++
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7045DropUselessAndOutdatedCdiApiTest.java
@@ -17,13 +17,13 @@ public class MavenITmng7045DropUselessAndOutdatedCdiApiTest
}
@Test
-public void testit()
+public void testShouldNotLeakCdiApi()
throws IOException, VerificationException
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng7045" );
Verifier verifier = newVerifier( testDir.getAbsolutePath()) ;
-verifier.executeGoal( "process-classes") ;
+verifier.executeGoal( "process-classes" );
verifier.resetStreams();
verifier.verifyErrorFreeLog();
}
diff --git a/core-it-suite/src/test/resources/mng7045/pom.xml
b/core-it-suite/src/test/resources/mng7045/pom.xml
index e983c1f..48f141b 100644
--- a/core-it-suite/src/test/resources/mng7045/pom.xml
+++ b/core-it-suite/src/test/resources/mng7045/pom.xml
@@ -7,7 +7,7 @@
Maven Integration Test :: MNG-7045
-Do a Maven exec-java which executes some CDI 2.0 code which would fail if
maven leaks CDI API 1.0.
+Runs a Groovy script which refers some CDI 2.0 code. The script fails if
Maven would leak CDI API 1.0.
@@ -53,9 +53,15 @@
javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")
-org.codehaus.groovy
+org.apache.groovy
+groovy-ant
+4.0.0-alpha-2
+runtime
+
+
+org.apache.groovy
groovy
-3.0.7
+4.0.0-alpha-2
runtime
