[maven] branch NG-6169/MNG-6552 created (now da91e6d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch NG-6169/MNG-6552 in repository https://gitbox.apache.org/repos/asf/maven.git. at da91e6d [MNG-6552] Packaging 'ejb' binding plugin upgrades This branch includes the following new commits: new da91e6d [MNG-6552] Packaging 'ejb' binding plugin upgrades 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] 01/01: [MNG-6552] Packaging 'ejb' binding plugin upgrades
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch NG-6169/MNG-6552 in repository https://gitbox.apache.org/repos/asf/maven.git commit da91e6dcfdc25d4fde1aa97516829cc78cb5e802 Author: Michael Osipov AuthorDate: Tue Jan 8 14:25:54 2019 +0100 [MNG-6552] Packaging 'ejb' binding plugin upgrades * Upgrade to Maven Resources Plugin 3.1.0 * Upgrade to Maven Compiler Plugin 3.8.0 * Upgrade to Maven Surefire Plugin 3.0.0-M3 * Upgrade to Maven EJB Plugin 3.0.1 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 --- .../main/resources/META-INF/plexus/default-bindings.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 4a303db..834d86a 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -111,28 +111,28 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources -org.apache.maven.plugins:maven-compiler-plugin:3.1:compile +org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources -org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.8.0:testCompile -org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test +org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test -org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb +org.apache.maven.plugins:maven-ejb-plugin:3.0.1:ejb -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
[maven] branch MNG-6530 created (now d9facde)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6530 in repository https://gitbox.apache.org/repos/asf/maven.git. at d9facde [MNG-6530] Introduce system property to disable global model cache This branch includes the following new commits: new d9facde [MNG-6530] Introduce system property to disable global model cache 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] 01/01: [MNG-6530] Introduce system property to disable global model cache
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6530 in repository https://gitbox.apache.org/repos/asf/maven.git commit d9facde3bc6093d9f8bad2b315e6a619f191cc0e Author: Mickael Istria AuthorDate: Tue Nov 27 22:56:31 2018 +0100 [MNG-6530] Introduce system property to disable global model cache The global model cache introduced in MNG-6311 causes severe regressions in case of POM files changing during application lifetime. This patch adds a system property `defaultProjectBuilder.disableGlobalModelCache` that disables this global model cache when set to true, ensure pom modifications are honored. This closes #194 --- .../maven/project/DefaultProjectBuilder.java | 23 .../apache/maven/project/ProjectBuilderTest.java | 41 ++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java index 35a4e9f..a402040 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java @@ -81,6 +81,9 @@ public class DefaultProjectBuilder implements ProjectBuilder { +public static final String DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY = +"maven.defaultProjectBuilder.disableGlobalModelCache"; + @Requirement private Logger logger; @@ -115,14 +118,21 @@ public class DefaultProjectBuilder public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest request ) throws ProjectBuildingException { -return build( pomFile, new FileModelSource( pomFile ), new InternalConfig( request, null ) ); +return build( pomFile, new FileModelSource( pomFile ), +new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ) ); +} + +private boolean useGlobalModelCache() +{ +return !Boolean.getBoolean( DISABLE_GLOBAL_MODEL_CACHE_SYSTEM_PROPERTY ); } @Override public ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request ) throws ProjectBuildingException { -return build( null, modelSource, new InternalConfig( request, null ) ); +return build( null, modelSource, + new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ) ); } private ProjectBuildingResult build( File pomFile, ModelSource modelSource, InternalConfig config ) @@ -293,7 +303,7 @@ public class DefaultProjectBuilder org.eclipse.aether.artifact.Artifact pomArtifact = RepositoryUtils.toArtifact( artifact ); pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact ); -InternalConfig config = new InternalConfig( request, null ); +InternalConfig config = new InternalConfig( request, null, useGlobalModelCache() ? getModelCache() : null ); boolean localProject; @@ -355,7 +365,8 @@ public class DefaultProjectBuilder ReactorModelPool modelPool = new ReactorModelPool(); -InternalConfig config = new InternalConfig( request, modelPool ); +InternalConfig config = new InternalConfig( request, modelPool, +useGlobalModelCache() ? getModelCache() : new ReactorModelCache() ); Map projectIndex = new HashMap<>( 256 ); @@ -951,11 +962,11 @@ public class DefaultProjectBuilder private final ReactorModelCache modelCache; -InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool ) +InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, ReactorModelCache modelCache ) { this.request = request; this.modelPool = modelPool; -this.modelCache = getModelCache(); +this.modelCache = modelCache; session = LegacyLocalRepositoryManager.overlay( request.getLocalRepository(), request.getRepositorySession(), repoSystem ); diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java index 18f22bd..c472e47 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java @@ -28,6 +28,9 @@ import org.apache.maven.AbstractCoreMavenComponentTestCase; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.building.FileModelSource; import org.apache.maven.model.building.ModelSource; +import org.apache.maven.shared.utils.io.FileUtils; + +import com.google.common.io.Files; public class ProjectBuilderTest
[maven] branch MNG-6169/MNG-6552 created (now da91e6d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6552 in repository https://gitbox.apache.org/repos/asf/maven.git. at da91e6d [MNG-6552] Packaging 'ejb' binding plugin upgrades No new revisions were added by this update.
[maven] 01/01: [MNG-6553] Packaging 'war' binding plugin upgrades
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6553 in repository https://gitbox.apache.org/repos/asf/maven.git commit f86a0cf806bc02388e971983e169fdb775e613a6 Author: Michael Osipov AuthorDate: Tue Jan 8 15:31:00 2019 +0100 [MNG-6553] Packaging 'war' binding plugin upgrades * Upgrade to Maven Resources Plugin 3.1.0 * Upgrade to Maven Compiler Plugin 3.8.0 * Upgrade to Maven Surefire Plugin 3.0.0-M3 * Upgrade to Maven WAR Plugin 3.2.2 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 --- .../main/resources/META-INF/plexus/default-bindings.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 4a303db..cf6a1cb 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -203,28 +203,28 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources -org.apache.maven.plugins:maven-compiler-plugin:3.1:compile +org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources -org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.8.0:testCompile -org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test +org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test -org.apache.maven.plugins:maven-war-plugin:2.2:war +org.apache.maven.plugins:maven-war-plugin:3.2.2:war -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
[maven] branch MNG-6169/MNG-6553 created (now f86a0cf)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6553 in repository https://gitbox.apache.org/repos/asf/maven.git. at f86a0cf [MNG-6553] Packaging 'war' binding plugin upgrades This branch includes the following new commits: new f86a0cf [MNG-6553] Packaging 'war' binding plugin upgrades 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] branch MNG-6169_2/not-updated-MJAR-MCOMPILER deleted (was c7cc7b3)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169_2/not-updated-MJAR-MCOMPILER in repository https://gitbox.apache.org/repos/asf/maven.git. was c7cc7b3 [MNG-6169] Lifecycle/binding plugin version updates This change permanently discards the following revisions: discard c7cc7b3 [MNG-6169] Lifecycle/binding plugin version updates discard 4feb0a2 [MNG-5935] Optional true getting lost in managed dependencies when transitive discard fb5566c [MNG-6228] Optionality not displayed in dependency tree when run in debug mode discard 6253214 [MNG-6186] use enhanced HawtJNI library loading (remove previous hack) discard 605ff23 [MNG-6205] upgraded JAnsi to 1.16 for console encoding fix discard 08d6cbf [MNG-6223] support -f path/to/dir when detecting .mvn discard bf05ee1 Add a ProjectArtifactsCache similar to PluginArtifactsCache discard b9d46b5 [MNG-6149] MetadataResolutionResult#getGraph() never resolves request type 'test' discard 756d984 Doc improvement in simplelogger.properties discard 87280cd MNG-6210 allow maven custom guice scopes in .mvn/extensions discard dcc1265 MNG-6209 better executeMojo thread context classloader discard 5f8bfa7 use "java -jar" command discard 244197c improved description of styled message API discard 0a2f222 Update the DOAP to include the 3.5.0 release discard 4494aaf Minor cleanup in MavenCli.java discard 35cfaef [maven-release-plugin] prepare for next development iteration discard 5787c0b [maven-release-plugin] prepare release maven-3.5.0 discard 5b3c27c Added some javadoc
[maven] branch MNG-6169_2/all-updated deleted (was ce1d69b)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169_2/all-updated in repository https://gitbox.apache.org/repos/asf/maven.git. was ce1d69b [MNG-6169] Lifecycle/binding plugin version updates This change permanently discards the following revisions: discard ce1d69b [MNG-6169] Lifecycle/binding plugin version updates
[maven] branch MNG-6169_2/updated-MCOMPILER deleted (was 323298b)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169_2/updated-MCOMPILER in repository https://gitbox.apache.org/repos/asf/maven.git. was 323298b [MNG-6169] Lifecycle/binding plugin version updates 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] branch MNG-6169_2/updated-MJAR deleted (was ae088cf)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169_2/updated-MJAR in repository https://gitbox.apache.org/repos/asf/maven.git. was ae088cf [MNG-6169] Lifecycle/binding plugin version updates This change permanently discards the following revisions: discard ae088cf [MNG-6169] Lifecycle/binding plugin version updates
[maven] branch NG-6169/MNG-6551 deleted (was 9ac6d2b)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch NG-6169/MNG-6551 in repository https://gitbox.apache.org/repos/asf/maven.git. was 9ac6d2b Upgrade to Maven Compiler Plugin 3.8.0 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] branch NG-6169/MNG-6552 deleted (was da91e6d)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch NG-6169/MNG-6552 in repository https://gitbox.apache.org/repos/asf/maven.git. was da91e6d [MNG-6552] Packaging 'ejb' binding plugin upgrades 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] 01/01: [MNG-6554] Packaging 'ear' binding plugin upgrades
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6554 in repository https://gitbox.apache.org/repos/asf/maven.git commit e01bf98485e7b6cccd515a671650e186db8af4d3 Author: Michael Osipov AuthorDate: Tue Jan 8 17:09:51 2019 +0100 [MNG-6554] Packaging 'ear' binding plugin upgrades * Upgrade to Maven EAR Plugin 3.0.1 * Upgrade to Maven Resources Plugin 3.1.0 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 --- .../src/main/resources/META-INF/plexus/default-bindings.xml| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 4a303db..dcba632 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -247,19 +247,19 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml + org.apache.maven.plugins:maven-ear-plugin:3.0.1:generate-application-xml -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources -org.apache.maven.plugins:maven-ear-plugin:2.8:ear +org.apache.maven.plugins:maven-ear-plugin:3.0.1:ear -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
[maven] branch MNG-6169/MNG-6554 created (now e01bf98)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6554 in repository https://gitbox.apache.org/repos/asf/maven.git. at e01bf98 [MNG-6554] Packaging 'ear' binding plugin upgrades This branch includes the following new commits: new e01bf98 [MNG-6554] Packaging 'ear' binding plugin upgrades 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] branch master updated (33e4f20 -> d9facde)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git. from 33e4f20 [MNG-6548] Lifecycle plugin version upgrades add d9facde [MNG-6530] Introduce system property to disable global model cache No new revisions were added by this update. Summary of changes: .../maven/project/DefaultProjectBuilder.java | 23 .../apache/maven/project/ProjectBuilderTest.java | 41 ++ 2 files changed, 58 insertions(+), 6 deletions(-)
[maven] 01/01: [MNG-6552] Packaging 'rar' binding plugin upgrades
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git commit 682e6ab6468a95728d82f91cefc947c080dd1d63 Author: Michael Osipov AuthorDate: Tue Jan 8 21:34:35 2019 +0100 [MNG-6552] Packaging 'rar' binding plugin upgrades * Upgrade to Maven Resources Plugin 3.1.0 * Upgrade to Maven Compiler Plugin 3.8.0 * Upgrade to Maven Surefire Plugin 3.0.0-M3 * Upgrade to Maven RAR Plugin 2.4 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 --- .../main/resources/META-INF/plexus/default-bindings.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 4a303db..12c6a57 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -282,28 +282,28 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources -org.apache.maven.plugins:maven-compiler-plugin:3.1:compile +org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources -org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.8.0:testCompile -org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test +org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test -org.apache.maven.plugins:maven-rar-plugin:2.2:rar +org.apache.maven.plugins:maven-rar-plugin:2.4:rar -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
[maven] branch MNG-6169/MNG-6555 created (now 682e6ab)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git. at 682e6ab [MNG-6552] Packaging 'rar' binding plugin upgrades This branch includes the following new commits: new 682e6ab [MNG-6552] Packaging 'rar' binding plugin upgrades 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] 01/01: [MNG-6256] Surround parameter of echo command with double quotes
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git commit a939654b765f06b1c1ee811a297b02e83b4ac316 Author: Christoph Etzel AuthorDate: Fri Jul 14 10:26:06 2017 +0200 [MNG-6256] Surround parameter of echo command with double quotes Fixes #128, #228 --- apache-maven/src/bin/mvn.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 823ccf0..fd1b21e 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -115,7 +115,7 @@ if "%FILE_ARG%" == "" ( goto findBaseDir ) if not exist "%FILE_ARG%" ( - echo POM file %FILE_ARG% specified the -f/--file command-line argument does not exist >&2 + echo POM file "%FILE_ARG%" specified the -f/--file command-line argument does not exist >&2 goto error ) if exist "%FILE_ARG%\*" ( @@ -124,7 +124,7 @@ if exist "%FILE_ARG%\*" ( call :get_directory_from_file "%FILE_ARG%" ) if not exist "%POM_DIR%" ( - echo Directory %POM_DIR% extracted from the -f/--file command-line argument %FILE_ARG% does not exist >&2 + echo Directory "%POM_DIR%" extracted from the -f/--file command-line argument "%FILE_ARG%" does not exist >&2 goto error ) set "WDIR=%POM_DIR%"
[maven] branch MNG-6256 updated (21d3bc0 -> a939654)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 21d3bc0 [MNG-6256] Surround parameter of echo command with double quotes add 391a111 [MNG-6526] Upgrade to Wagon 3.3.1 add eab62f1 [MNG-6520] Update namespaces for maven-assembly to 2.0.0 add 33e4f20 [MNG-6548] Lifecycle plugin version upgrades add d9facde [MNG-6530] Introduce system property to disable global model cache new a939654 [MNG-6256] Surround parameter of echo command with double quotes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (21d3bc0) \ N -- N -- N refs/heads/MNG-6256 (a939654) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apache-maven/src/bin/mvn.cmd | 4 +-- apache-maven/src/main/assembly/bin.xml | 4 +-- apache-maven/src/main/assembly/component.xml | 4 +-- apache-maven/src/main/assembly/dir.xml | 4 +-- apache-maven/src/main/assembly/src.xml | 4 +-- .../maven/project/DefaultProjectBuilder.java | 23 .../main/resources/META-INF/plexus/components.xml | 6 ++-- .../apache/maven/project/ProjectBuilderTest.java | 41 ++ pom.xml| 2 +- 9 files changed, 72 insertions(+), 20 deletions(-)
[maven] 02/03: Upgrade to Maven Compiler Plugin 3.8.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git commit 04ecb8da94b3d86ab2ef8144babe926901bc3cd8 Author: Michael Osipov AuthorDate: Tue Jan 8 22:29:50 2019 +0100 Upgrade to Maven Compiler Plugin 3.8.0 --- maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 0dcf601..436ddf1 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -158,7 +158,7 @@ Mappings to default lifecycle, specific for each packaging. org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources -org.apache.maven.plugins:maven-compiler-plugin:3.1:compile +org.apache.maven.plugins:maven-compiler-plugin:3.8.0:compile org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor @@ -167,7 +167,7 @@ Mappings to default lifecycle, specific for each packaging. org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources -org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile + org.apache.maven.plugins:maven-compiler-plugin:3.8.0:testCompile org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
[maven] 03/03: Upgrade to Maven Surefire Plugin 3.0.0-M3
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git commit f5ddd678d2178fc028d21dc9a48c573f7d52bd4c Author: Michael Osipov AuthorDate: Tue Jan 8 22:44:25 2019 +0100 Upgrade to Maven Surefire Plugin 3.0.0-M3 --- maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 436ddf1..607d1d2 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -170,7 +170,7 @@ Mappings to default lifecycle, specific for each packaging. org.apache.maven.plugins:maven-compiler-plugin:3.8.0:testCompile -org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test +org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3:test org.apache.maven.plugins:maven-jar-plugin:2.4:jar,
[maven] branch MNG-6169/MNG-6555 updated (682e6ab -> f5ddd67)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git. from 682e6ab [MNG-6552] Packaging 'rar' binding plugin upgrades new c7f2954 Upgrade to Maven Resources Plugin 3.1.0 new 04ecb8d Upgrade to Maven Compiler Plugin 3.8.0 new f5ddd67 Upgrade to Maven Surefire Plugin 3.0.0-M3 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/META-INF/plexus/default-bindings.xml| 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
[maven] 01/03: Upgrade to Maven Resources Plugin 3.1.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git commit c7f2954bc8880ee653c2f2ee0c40f313cff3d510 Author: Michael Osipov AuthorDate: Tue Jan 8 22:14:18 2019 +0100 Upgrade to Maven Resources Plugin 3.1.0 --- maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 12c6a57..0dcf601 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -155,7 +155,7 @@ Mappings to default lifecycle, specific for each packaging. -org.apache.maven.plugins:maven-resources-plugin:2.6:resources +org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources org.apache.maven.plugins:maven-compiler-plugin:3.1:compile @@ -164,7 +164,7 @@ Mappings to default lifecycle, specific for each packaging. org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor - org.apache.maven.plugins:maven-resources-plugin:2.6:testResources + org.apache.maven.plugins:maven-resources-plugin:3.1.0:testResources org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile
[maven-release] 01/02: Attempt to reproduce issue, but it seems the bug does not exist any longer.
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MRELEASE-161 in repository https://gitbox.apache.org/repos/asf/maven-release.git commit e2501b6e2b9a7ad8e1978c8fef59a9b018853651 Author: Andre Tadeu de Carvalho AuthorDate: Tue Jan 8 16:45:01 2019 -0200 Attempt to reproduce issue, but it seems the bug does not exist any longer. --- .../MRELEASE-161-dependencyManagement/pom.xml | 87 ++ .../release-test-module-one/pom.xml| 49 .../plugin/release/its/module1/AppModuleOne.java | 32 .../release-test-module-two/pom.xml| 47 .../plugin/release/its/module2/AppModuleTwo.java | 32 .../verify.groovy | 29 .../src/it/projects/prepare/MRELEASE-161/pom.xml | 68 + .../MRELEASE-161/release-test-module-one/pom.xml | 49 .../plugin/release/its/module1/AppModuleOne.java | 32 .../MRELEASE-161/release-test-module-two/pom.xml | 49 .../plugin/release/its/module2/AppModuleTwo.java | 32 .../it/projects/prepare/MRELEASE-161/verify.groovy | 29 12 files changed, 535 insertions(+) diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml new file mode 100644 index 000..0cffe8e --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml @@ -0,0 +1,87 @@ + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + 4.0.0 + org.apache.maven.plugin.release.its + mrelease-161 + 1.0-SNAPSHOT + This is the base POM the release test modules + pom + O2 Release test Base Module + +release-test-module-one +release-test-module-two + + +scm:git|sd_pa/tools/release-test + + + + + +org.apache.maven.plugin.release.its +release-test-module-one +1.0-SNAPSHOT + + + +org.apache.maven.plugin.release.its +release-test-module-one +1.0-SNAPSHOT +test-jar +test + + + + + + + +org.apache.maven.plugins +maven-source-plugin + + +package + + jar + + + + + + + + + o2-webdav + ${repository.o2.webdav} + + + o2-webdav + ${repository.o2.webdav} + + + + dav:${o2.module.sites.rootUrl}/${project.groupId}/${project.artifactId}-${project.version} + + + diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml new file mode 100644 index 000..aac0870 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml @@ -0,0 +1,49 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + +org.apache.maven.plugin.release.its +mrelease-161 +1.0-SNAPSHOT + + 4.0.0 + release-test-module-one + 1.0-SNAPSHOT + release-test-module-one + http://maven.apache.org + + + + +org.apache.maven.plugins +maven-jar-plugin + + + + test-jar + + + + + + + + \ No newline at end of file diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java new file mode 100644 index 000..478680f --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java @@ -0,0 +1,32 @@ +/* + * 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
[maven-release] 02/02: Remove Java source files.
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MRELEASE-161 in repository https://gitbox.apache.org/repos/asf/maven-release.git commit 6ef1624ab04df1ad984cae78c5a8b72588f4ebfd Author: Andre Tadeu de Carvalho AuthorDate: Tue Jan 8 19:44:20 2019 -0200 Remove Java source files. --- .../plugin/release/its/module1/AppModuleOne.java | 32 -- .../plugin/release/its/module2/AppModuleTwo.java | 32 -- .../plugin/release/its/module1/AppModuleOne.java | 32 -- .../plugin/release/its/module2/AppModuleTwo.java | 32 -- 4 files changed, 128 deletions(-) diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java deleted file mode 100644 index 478680f..000 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ - -package org.apache.maven.plugin.release.its.module1; - -/** - * Hello world! - * - */ -public class AppModuleOne -{ -public static void main( String[] args ) -{ -System.out.println( "Hello World!" ); -} -} diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/src/main/java/org/apache/maven/plugin/release/its/module2/AppModuleTwo.java b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/src/main/java/org/apache/maven/plugin/release/its/module2/AppModuleTwo.java deleted file mode 100644 index afde20f..000 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/src/main/java/org/apache/maven/plugin/release/its/module2/AppModuleTwo.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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. - */ - -package org.apache.maven.plugin.release.its.module2; - -/** - * Hello world! - * - */ -public class AppModuleTwo -{ -public static void main( String[] args ) -{ -System.out.println( "Hello World!" ); -} -} diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java deleted file mode 100644 index 478680f..000 --- a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161/release-test-module-one/src/main/java/org/apache/maven/plugin/release/its/module1/AppModuleOne.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 m
[maven-release] branch MRELEASE-161 created (now 6ef1624)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MRELEASE-161 in repository https://gitbox.apache.org/repos/asf/maven-release.git. at 6ef1624 Remove Java source files. This branch includes the following new commits: new e2501b6 Attempt to reproduce issue, but it seems the bug does not exist any longer. new 6ef1624 Remove Java source files. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[maven] 01/01: [MNG-6256] Check ITs tests without patch
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git commit ad21680a4d6a8806183739a1c3f1d615fc7fa1d5 Author: Sylwester Lachiewicz AuthorDate: Tue Jan 8 22:59:40 2019 +0100 [MNG-6256] Check ITs tests without patch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7c580cd..3ebe664 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ node(jenkinsEnv.nodeSelection(osNode)) { } } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'MNG-6256'] } }
[maven] branch MNG-6256 updated (a939654 -> ad21680)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git. discard a939654 [MNG-6256] Surround parameter of echo command with double quotes new ad21680 [MNG-6256] Check ITs tests without patch This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a939654) \ N -- N -- N refs/heads/MNG-6256 (ad21680) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile | 2 +- apache-maven/src/bin/mvn.cmd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[maven-integration-testing] 01/01: MNG-6265 Add integration test
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git commit 0aad02b4ef5e17a21e74a19934974744ea06b415 Author: Christoph Etzel AuthorDate: Fri Jul 14 10:43:58 2017 +0200 MNG-6265 Add integration test --- .../org/apache/maven/it/IntegrationTestSuite.java | 1 + ...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++ .../folder-with- -space/pom.xml| 8 ++ .../folder-with-)-closing-bracket/pom.xml | 8 ++ 4 files changed, 109 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 324bcf5..6ca0637 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 // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class ); suite.addTestSuite( MavenITmng6386BaseUriPropertyTest.class ); suite.addTestSuite( MavenITmng6330RelativePath.class ); suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java new file mode 100644 index 000..de79610 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -0,0 +1,92 @@ +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 java.io.File; + +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-6256";>MNG-6256: check that directories + * passed via -f/--file containing special characters do not break the script. E.g + * -f "folderWithClosing)Bracket/pom.xml". + */ +public class MavenITmng6256SpecialCharsAlternatePOMLocation +extends AbstractMavenIntegrationTestCase +{ +public MavenITmng6256SpecialCharsAlternatePOMLocation() +{ +super( "[3.6.1-SNAPSHOT,)" ); +} + +protected MavenITmng6256SpecialCharsAlternatePOMLocation( String constraint ) +{ +super( constraint ); +} + +/** + * check script is working when path to POM is set to folder-with- -space + */ +public void testFolderWithSpace() +throws Exception +{ +runWithMvnFileLongOption( "folder-with- -space" ); +runWithMvnFileShortOption( "folder-with- -space" ); +} + +/** + * check script is working when path to POM is set to folder-with-)-closing-bracket + */ +public void testFolderWithClosingBracket() +throws Exception +{ +runWithMvnFileLongOption( "folder-with-)-closing-bracket" ); +runWithMvnFileShortOption( "folder-with-)-closing-bracket" ); +} + +private void runWithMvnFileLongOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "--file", subDir ); +} + +private void runWithMvnFileShortOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "-f", subDir ); +} + +private void runCoreExtensionWithOption( String option, String subDir ) +throws Exception +{ +File resourceDir = +ResourceExtractor.simpleExtractResources( getClass(), "/mng-6256-special-chars-alternate-pom-location" ); + +File testDir = new File( resourceDir, "../mng-6256-" + subDir ); +testDir.mkdir(); + +Verifier verifier = newVerifier( testDir.getAbsolutePath() ); +verifier.getCliOptions().add( option ); // -f/--file +verifier.getCliOptions()
[maven-integration-testing] branch MNG-6256 created (now 0aad02b)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. at 0aad02b MNG-6265 Add integration test This branch includes the following new commits: new 0aad02b MNG-6265 Add integration test 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] branch MNG-6169/MNG-6555 updated: * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MNG-6169/MNG-6555 in repository https://gitbox.apache.org/repos/asf/maven.git The following commit(s) were added to refs/heads/MNG-6169/MNG-6555 by this push: new c945f88 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 c945f88 is described below commit c945f8803625158aaa3be74247c0f75911e0aa1b Author: Michael Osipov AuthorDate: Tue Jan 8 23:21:14 2019 +0100 * Upgrade to Maven Install Plugin 3.0.0-M1 * Upgrade to Maven Deploy Plugin 3.0.0-M1 --- maven-core/src/main/resources/META-INF/plexus/default-bindings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 607d1d2..5bb9281 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -177,10 +177,10 @@ Mappings to default lifecycle, specific for each packaging. org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata -org.apache.maven.plugins:maven-install-plugin:2.4:install +org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install -org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy +org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
[maven-release] branch master updated: [MRELEASE-161] If there is more than one artifact with the same artifactId in dependencyManagement only the first one is updated
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 74a54c6 [MRELEASE-161] If there is more than one artifact with the same artifactId in dependencyManagement only the first one is updated 74a54c6 is described below commit 74a54c61ee84e62d59b5d3fc1ed9c2e274e74398 Author: André Tadeu de Carvalho AuthorDate: Tue Jan 8 20:48:54 2019 -0200 [MRELEASE-161] If there is more than one artifact with the same artifactId in dependencyManagement only the first one is updated --- .../MRELEASE-161-dependencyManagement/pom.xml | 87 ++ .../release-test-module-one/pom.xml| 49 .../release-test-module-two/pom.xml| 47 .../verify.groovy | 29 .../src/it/projects/prepare/MRELEASE-161/pom.xml | 68 + .../MRELEASE-161/release-test-module-one/pom.xml | 49 .../MRELEASE-161/release-test-module-two/pom.xml | 49 .../it/projects/prepare/MRELEASE-161/verify.groovy | 29 8 files changed, 407 insertions(+) diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml new file mode 100644 index 000..0cffe8e --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/pom.xml @@ -0,0 +1,87 @@ + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + 4.0.0 + org.apache.maven.plugin.release.its + mrelease-161 + 1.0-SNAPSHOT + This is the base POM the release test modules + pom + O2 Release test Base Module + +release-test-module-one +release-test-module-two + + +scm:git|sd_pa/tools/release-test + + + + + +org.apache.maven.plugin.release.its +release-test-module-one +1.0-SNAPSHOT + + + +org.apache.maven.plugin.release.its +release-test-module-one +1.0-SNAPSHOT +test-jar +test + + + + + + + +org.apache.maven.plugins +maven-source-plugin + + +package + + jar + + + + + + + + + o2-webdav + ${repository.o2.webdav} + + + o2-webdav + ${repository.o2.webdav} + + + + dav:${o2.module.sites.rootUrl}/${project.groupId}/${project.artifactId}-${project.version} + + + diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml new file mode 100644 index 000..aac0870 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-one/pom.xml @@ -0,0 +1,49 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + +org.apache.maven.plugin.release.its +mrelease-161 +1.0-SNAPSHOT + + 4.0.0 + release-test-module-one + 1.0-SNAPSHOT + release-test-module-one + http://maven.apache.org + + + + +org.apache.maven.plugins +maven-jar-plugin + + + + test-jar + + + + + + + + \ No newline at end of file diff --git a/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml new file mode 100644 index 000..0e494b9 --- /dev/null +++ b/maven-release-plugin/src/it/projects/prepare/MRELEASE-161-dependencyManagement/release-test-module-two/pom.xml @@ -0,0 +1,47 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + +org.apache.maven.plugin.release.its +mrelease-161 +1.0-SNAPSHOT + + 4.0.0 + release-test-module-two + release-test-module-two + 1.0-SNAPSHOT + http://maven.apache.org + + + + org.apache.maven.plugin.release.its + release-test-module-one + + + + org.apache.maven.plugin.release.its + release-test-module-one + test-jar + test + + +
[maven-integration-testing] branch MNG-6256 updated (0aad02b -> ae200c3)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. discard 0aad02b MNG-6265 Add integration test new ae200c3 MNG-6265 Add integration test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0aad02b) \ N -- N -- N refs/heads/MNG-6256 (ae200c3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[maven-integration-testing] 01/01: MNG-6265 Add integration test
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git commit ae200c3ac54dc61e84e29439fed7b0a87c4fa7cb Author: Christoph Etzel AuthorDate: Fri Jul 14 10:43:58 2017 +0200 MNG-6265 Add integration test --- .../org/apache/maven/it/IntegrationTestSuite.java | 1 + ...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++ .../folder-with- -space/pom.xml| 8 ++ .../folder-with-)-closing-bracket/pom.xml | 8 ++ 4 files changed, 109 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 324bcf5..6ca0637 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 // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class ); suite.addTestSuite( MavenITmng6386BaseUriPropertyTest.class ); suite.addTestSuite( MavenITmng6330RelativePath.class ); suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java new file mode 100644 index 000..5038113 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -0,0 +1,92 @@ +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 java.io.File; + +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-6256";>MNG-6256: check that directories + * passed via -f/--file containing special characters do not break the script. E.g + * -f "folderWithClosing)Bracket/pom.xml". + */ +public class MavenITmng6256SpecialCharsAlternatePOMLocation +extends AbstractMavenIntegrationTestCase +{ +public MavenITmng6256SpecialCharsAlternatePOMLocation() +{ +super( "(3.6.0,)" ); +} + +protected MavenITmng6256SpecialCharsAlternatePOMLocation( String constraint ) +{ +super( constraint ); +} + +/** + * check script is working when path to POM is set to folder-with- -space + */ +public void testFolderWithSpace() +throws Exception +{ +runWithMvnFileLongOption( "folder-with- -space" ); +runWithMvnFileShortOption( "folder-with- -space" ); +} + +/** + * check script is working when path to POM is set to folder-with-)-closing-bracket + */ +public void testFolderWithClosingBracket() +throws Exception +{ +runWithMvnFileLongOption( "folder-with-)-closing-bracket" ); +runWithMvnFileShortOption( "folder-with-)-closing-bracket" ); +} + +private void runWithMvnFileLongOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "--file", subDir ); +} + +private void runWithMvnFileShortOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "-f", subDir ); +} + +private void runCoreExtensionWithOption( String option, String subDir ) +throws Exception +{ +File resourceDir = +ResourceExtractor.simpleExtractResources( getClass(), "/mng-6256-special-chars-alternate-pom-location" ); + +File testDir = new File( resourceDir, "../mng-6256-" + subDir ); +testDir.mkdir(); + +Verifier verifier = newVerifier( testDir.getAbsolutePath() ); +verifier.getCliOptions().add( option ); // -f/--file +verifier.getCliOptions().add( "\"
[maven-integration-testing] branch master updated: [MNG-6265] Add integration test
This is an automated email from the ASF dual-hosted git repository. slachiewicz 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 3e2b601 [MNG-6265] Add integration test 3e2b601 is described below commit 3e2b60143c350f0e776ebc4c1a9b88e329f46897 Author: Christoph Etzel AuthorDate: Fri Jul 14 10:43:58 2017 +0200 [MNG-6265] Add integration test Fixes #23 --- .../org/apache/maven/it/IntegrationTestSuite.java | 1 + ...nITmng6256SpecialCharsAlternatePOMLocation.java | 92 ++ .../folder-with- -space/pom.xml| 8 ++ .../folder-with-)-closing-bracket/pom.xml | 8 ++ 4 files changed, 109 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 324bcf5..6ca0637 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 // - // suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); -- MNG-3137 +suite.addTestSuite( MavenITmng6256SpecialCharsAlternatePOMLocation.class ); suite.addTestSuite( MavenITmng6386BaseUriPropertyTest.class ); suite.addTestSuite( MavenITmng6330RelativePath.class ); suite.addTestSuite( MavenITmng5965ParallelBuildMultipliesWorkTest.class ); diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java new file mode 100644 index 000..5038113 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6256SpecialCharsAlternatePOMLocation.java @@ -0,0 +1,92 @@ +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 java.io.File; + +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for https://issues.apache.org/jira/browse/MNG-6256";>MNG-6256: check that directories + * passed via -f/--file containing special characters do not break the script. E.g + * -f "folderWithClosing)Bracket/pom.xml". + */ +public class MavenITmng6256SpecialCharsAlternatePOMLocation +extends AbstractMavenIntegrationTestCase +{ +public MavenITmng6256SpecialCharsAlternatePOMLocation() +{ +super( "(3.6.0,)" ); +} + +protected MavenITmng6256SpecialCharsAlternatePOMLocation( String constraint ) +{ +super( constraint ); +} + +/** + * check script is working when path to POM is set to folder-with- -space + */ +public void testFolderWithSpace() +throws Exception +{ +runWithMvnFileLongOption( "folder-with- -space" ); +runWithMvnFileShortOption( "folder-with- -space" ); +} + +/** + * check script is working when path to POM is set to folder-with-)-closing-bracket + */ +public void testFolderWithClosingBracket() +throws Exception +{ +runWithMvnFileLongOption( "folder-with-)-closing-bracket" ); +runWithMvnFileShortOption( "folder-with-)-closing-bracket" ); +} + +private void runWithMvnFileLongOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "--file", subDir ); +} + +private void runWithMvnFileShortOption( String subDir ) +throws Exception +{ +runCoreExtensionWithOption( "-f", subDir ); +} + +private void runCoreExtensionWithOption( String option, String subDir ) +throws Exception +{ +File resourceDir = +ResourceExtractor.simpleExtractResources( getClass(), "/mng-6256-special-chars-alternate-pom-location" ); + +File testDir = new File( resourceDir, "../mng-6256-" + subDir ); +testDir.mkdir(); + +
[maven-integration-testing] branch MNG-6256 deleted (was ae200c3)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. was ae200c3 MNG-6265 Add integration test This change permanently discards the following revisions: discard ae200c3 MNG-6265 Add integration test
[maven] branch MNG-6256 updated (ad21680 -> a939654)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git. discard ad21680 [MNG-6256] Check ITs tests without patch new a939654 [MNG-6256] Surround parameter of echo command with double quotes This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ad21680) \ N -- N -- N refs/heads/MNG-6256 (a939654) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile | 2 +- apache-maven/src/bin/mvn.cmd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[maven] 01/01: [MNG-6256] Surround parameter of echo command with double quotes
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git commit a939654b765f06b1c1ee811a297b02e83b4ac316 Author: Christoph Etzel AuthorDate: Fri Jul 14 10:26:06 2017 +0200 [MNG-6256] Surround parameter of echo command with double quotes Fixes #128, #228 --- apache-maven/src/bin/mvn.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index 823ccf0..fd1b21e 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -115,7 +115,7 @@ if "%FILE_ARG%" == "" ( goto findBaseDir ) if not exist "%FILE_ARG%" ( - echo POM file %FILE_ARG% specified the -f/--file command-line argument does not exist >&2 + echo POM file "%FILE_ARG%" specified the -f/--file command-line argument does not exist >&2 goto error ) if exist "%FILE_ARG%\*" ( @@ -124,7 +124,7 @@ if exist "%FILE_ARG%\*" ( call :get_directory_from_file "%FILE_ARG%" ) if not exist "%POM_DIR%" ( - echo Directory %POM_DIR% extracted from the -f/--file command-line argument %FILE_ARG% does not exist >&2 + echo Directory "%POM_DIR%" extracted from the -f/--file command-line argument "%FILE_ARG%" does not exist >&2 goto error ) set "WDIR=%POM_DIR%"
[maven] branch master updated (d9facde -> a939654)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven.git. from d9facde [MNG-6530] Introduce system property to disable global model cache add a939654 [MNG-6256] Surround parameter of echo command with double quotes No new revisions were added by this update. Summary of changes: apache-maven/src/bin/mvn.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven] branch MNG-6256 deleted (was a939654)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6256 in repository https://gitbox.apache.org/repos/asf/maven.git. was a939654 [MNG-6256] Surround parameter of echo command with double quotes 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] branch MNG-6346 deleted (was d2cb7e6)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6346 in repository https://gitbox.apache.org/repos/asf/maven.git. was d2cb7e6 [MNG-6346] Add " around echo in mvn.cmd This change permanently discards the following revisions: discard d2cb7e6 [MNG-6346] Add " around echo in mvn.cmd
[maven] branch MNG-6544 deleted (was c7ab987)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6544 in repository https://gitbox.apache.org/repos/asf/maven.git. was c7ab987 [MNG-6544] Replace CacheUtils#{eq,hash} with Objects 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] branch MNG-6530 deleted (was d9facde)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch MNG-6530 in repository https://gitbox.apache.org/repos/asf/maven.git. was d9facde [MNG-6530] Introduce system property to disable global model cache The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.