You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/01/29 11:38:08 UTC
[maven] branch maven.config-from-start-scripts updated (140f36c -> a4078ee)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit 140f36c Update startup scripts
omit 1c10e5a Remove Java code for parsing
omit 6acc6d7 Remove non-usable test
add 712199a (doc) hacktoberfest
add a748596 [MNG-7329] Upgrade maven-enforcer-plugin
add 0a72185 [MNG-7331] Upgrade Jansi to 2.4.0
add f43f9f8 [MNG-7332] No longer support --define
add 9dbd8e7 Update DOAP with Maven 3.8.4 release
add 98a6c4f [MNG-7340] Option fail-on-severity takes one argument
add ae8aebe [MNG-7182] Use the MX xpp parser instead of a STAX transformation (#486)
add c9c6844 Update organization of Martin Kanters
add 3a06530 Remove duplicate call to longOpt (#626)
add 16dd31a [MNG-7339] Verify Maven can build itself
add 33aedfc [MNG-7156][MNG-7285] Add locking in MojoExecutor (#627)
add e6287b4 Improve startup scripts
add 6257b33 [MNG-7193] Introduce MAVEN_ARGS environment variable
add f793d86 [MWRAPPER-14] remove Maven Wrapper from core
add 3d4d6d8 fix wrong dependencies
add 951b5ee Fix SLF4J license link
add 0a8bd72 [MNG-7370] Upgrade Maven Wagon to 3.5.1
add d8445a5 Improve PR template
add 2cb4fe9 [MNG-7377] Add .vscode/ to .gitignore
add 46d57bd [MNG-7374] Mutating RelocatedArtifact does not retain type
add 706d931 [MNG-7369] Maven BOM doesn't need to package as a JAR
add d6b9108 [MNG-6917] upgrade maven-wrapper-plugin to 3.1.0
add 2670c00 [MNG-5561] Plugin relocation loses configuration
add b477357 [MNG-6326] Make the build fail if core extensions can not be loaded (#648)
add e5b0831 [MNG-7263] refactor lifecycle providers to ease documentation
add 711d5fb [MNG-7263] introduce AbstractLifecycleProvider
add 94af1d9 [MNG-7263] improve AbstractLifecycleProvider
add a7375a0 [MNG-7263] use constants instead of copy/paste
add a53083d [MNG-7264] refactor packaging bindings providers to ease maintenance
add 7180d68 Proposal to change abstract provider
add e617d51 [MNG-7264] packaging plugins bindings cannot be empty
add 8bde888 [MNG-7267] update lifecycle documentation after switch from Plexus XML
add f30a0ab [MNG-7267] update artifact handlers documentation
add c229278 rework javadoc
add 4476026 [MNG-7217] Update Commons CLI to version 1.5.0
add faf5d5d [MNG-7347] SessionScoped beans should be singletons for a given session (#621)
add 7a772fe [MNG-7362] DefaultArtifactResolver has spurious "Failure detected" INFO log
add 18725ec [MNG-7380] Don't log non-threadsafe warning if only building a single module
add c0a49c7 [MNG-7384] Upgrade Maven JAR Plugin to 3.2.2
add ab4fec0 [MNG-7381] Shorten parallel builder thread name to artifactId, conditionally with groupId
add 9d4b2b2 [MNG-7345] Fix exported packages (#618)
add 76452c7 [MNG-7339] Verify Maven can build itself less often
add 1af8513 [MNG-7385] improve repository metadata documentation
add dbfe809 [MNG-7386] Make sure the ModelMerger$MergingList can be serialized
add 6b60710 [MNG-7349] Limit relocation warning message to direct dependencies only
new 104dc77 Remove non-usable test
new 68a2c09 Remove Java code for parsing
new a4078ee Update startup scripts
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 (140f36c)
\
N -- N -- N refs/heads/maven.config-from-start-scripts (a4078ee)
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 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:
.asf.yaml | 1 +
.github/pull_request_template.md | 19 +-
.github/workflows/maven.yml | 28 +-
.github/workflows/maven_build_itself.yml | 73 +++
.gitignore | 1 +
Jenkinsfile | 14 +-
Jenkinsfile.its | 4 +-
apache-maven-wrapper/pom.xml | 128 -----
apache-maven-wrapper/src/assembly/bin.xml | 85 ----
apache-maven-wrapper/src/assembly/script.xml | 77 ---
apache-maven-wrapper/src/assembly/script/download | 51 --
.../src/assembly/script/download.cmd | 32 --
.../shared/mvn/wrapper/maven-wrapper.properties | 17 -
apache-maven-wrapper/src/assembly/shared/mvnwDebug | 35 --
.../src/assembly/shared/mvnwDebug.cmd | 44 --
.../src/assembly/shared/mvnwlauncher | 3 -
.../src/assembly/shared/mvnwlauncher.cmd | 3 -
apache-maven-wrapper/src/assembly/source.xml | 82 ---
apache-maven-wrapper/src/assembly/source/download | 34 --
.../src/assembly/source/download.cmd | 21 -
.../source/mvn/wrapper/MavenWrapperDownloader.java | 131 -----
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 ---
apache-maven-wrapper/src/site/site.xml | 31 --
apache-maven/pom.xml | 8 -
apache-maven/src/assembly/component.xml | 1 -
apache-maven/src/assembly/shared/run.cmd | 2 +-
apache-maven/src/assembly/shared/validate | 1 +
apache-maven/src/assembly/shared/validate.cmd | 1 +
.../licenses/MIT-jsoup-1.12.1.txt | 23 -
.../licenses/MIT-slf4j-api-1.7.32.txt | 2 +-
doap_Maven.rdf | 9 +
.../legacy/metadata/ArtifactMetadata.java | 8 +-
maven-bom/pom.xml | 13 +
.../artifact/resolver/DefaultArtifactResolver.java | 1 -
.../providers/EarArtifactHandlerProvider.java | 3 +
.../providers/EjbArtifactHandlerProvider.java | 3 +
.../EjbClientArtifactHandlerProvider.java | 3 +
.../providers/JarArtifactHandlerProvider.java | 3 +
.../JavaSourceArtifactHandlerProvider.java | 3 +
.../providers/JavadocArtifactHandlerProvider.java | 3 +
.../MavenPluginArtifactHandlerProvider.java | 3 +
.../providers/PomArtifactHandlerProvider.java | 3 +
.../providers/RarArtifactHandlerProvider.java | 3 +
.../providers/TestJarArtifactHandlerProvider.java | 3 +
.../providers/WarArtifactHandlerProvider.java | 3 +
.../aether/ConsumerModelSourceTransformer.java | 97 +---
.../DefaultRepositorySystemSessionFactory.java | 30 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 16 +-
.../internal/DefaultMojoExecutionConfigurator.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 13 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 3 +-
.../maven/lifecycle/internal/MojoExecutor.java | 83 +++
.../maven/lifecycle/internal/ReactorContext.java | 14 +-
.../lifecycle/internal/builder/BuilderCommon.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 32 +-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 3 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 4 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 4 +-
.../providers/EarLifecycleMappingProvider.java | 83 ---
.../providers/EjbLifecycleMappingProvider.java | 95 ----
.../providers/JarLifecycleMappingProvider.java | 95 ----
.../MavenPluginLifecycleMappingProvider.java | 100 ----
.../providers/PomLifecycleMappingProvider.java | 71 ---
.../providers/RarLifecycleMappingProvider.java | 95 ----
.../providers/WarLifecycleMappingProvider.java | 95 ----
.../providers/AbstractLifecycleProvider.java | 71 +++
.../providers/CleanLifecycleProvider.java | 54 +-
.../providers/DefaultLifecycleProvider.java | 87 ++--
.../lifecycle/providers/SiteLifecycleProvider.java | 58 +--
.../providers/WrapperLifecycleProvider.java | 52 +-
.../AbstractLifecycleMappingProvider.java | 69 +++
.../packaging/EarLifecycleMappingProvider.java} | 43 +-
.../packaging/EjbLifecycleMappingProvider.java | 53 ++
.../packaging/JarLifecycleMappingProvider.java | 53 ++
.../MavenPluginLifecycleMappingProvider.java | 55 ++
.../packaging/PomLifecycleMappingProvider.java} | 35 +-
.../packaging/RarLifecycleMappingProvider.java | 53 ++
.../packaging/WarLifecycleMappingProvider.java | 53 ++
.../DefaultPluginDependenciesResolver.java | 12 +
.../DefaultProjectDependenciesResolver.java | 16 +
.../maven/session/scope/internal/SessionScope.java | 137 +++--
.../main/resources/META-INF/maven/extension.xml | 3 +-
maven-core/src/site/apt/artifact-handlers.apt | 2 +-
maven-core/src/site/apt/default-bindings.apt.vm | 24 +-
maven-core/src/site/apt/lifecycles.apt.vm | 20 +-
.../internal/stub/BuildPluginManagerStub.java | 2 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 9 +-
.../apache/maven/project/ProjectBuilderTest.java | 13 +
.../session/scope/internal/SessionScopeTest.java | 81 +++
.../main/java/org/apache/maven/cli/CLIManager.java | 10 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 124 ++---
.../internal/BootstrapCoreExtensionManager.java | 35 +-
.../cli/internal/ExtensionResolutionException.java | 20 +-
maven-embedder/src/main/mdo/core-extensions.mdo | 26 +
.../java/org/apache/maven/cli/CLIManagerTest.java | 50 --
.../java/org/apache/maven/cli/MavenCliTest.java | 79 ++-
.../building/AbstractModelSourceTransformer.java | 205 --------
.../building/BuildModelSourceTransformer.java | 53 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 6 +-
.../building/DefaultModelSourceTransformer.java | 10 +-
.../model/building/ModelSourceTransformer.java | 8 +-
.../apache/maven/model/io/DefaultModelReader.java | 105 ++--
.../DefaultInheritanceAssemblerTest.java | 15 +-
maven-model-transform/pom.xml | 4 +
.../model/transform/AbstractEventXMLFilter.java | 285 -----------
.../model/transform/BuildToRawPomXMLFilter.java | 58 ---
.../transform/BuildToRawPomXMLFilterFactory.java | 64 +--
.../transform/BuildToRawPomXMLFilterListener.java | 42 --
.../maven/model/transform/CiFriendlyXMLFilter.java | 70 +--
.../maven/model/transform/DependencyKey.java | 87 ----
.../maven/model/transform/FastForwardFilter.java | 96 ++--
.../maven/model/transform/ModulesXMLFilter.java | 82 +--
.../maven/model/transform/ParentXMLFilter.java | 226 ++++-----
.../model/transform/RawToConsumerPomXMLFilter.java | 62 ---
.../RawToConsumerPomXMLFilterFactory.java | 22 +-
.../transform/ReactorDependencyXMLFilter.java | 186 +++----
.../model/transform/RelativePathXMLFilter.java | 99 ++--
.../model/transform/pull/BufferingParser.java | 563 +++++++++++++++++++++
.../model/transform/pull/NodeBufferingParser.java | 81 +++
.../maven/model/transform/pull/XmlUtils.java | 132 +++++
.../model/transform/sax/AbstractSAXFilter.java | 143 ------
.../model/transform/sax/CommentRenormalizer.java | 108 ----
.../maven/model/transform/sax/Factories.java | 79 ---
.../apache/maven/model/transform/sax/SAXEvent.java | 34 --
.../maven/model/transform/sax/SAXEventFactory.java | 144 ------
.../maven/model/transform/sax/SAXEventUtils.java | 49 --
.../model/transform/AbstractXMLFilterTests.java | 180 +------
.../model/transform/CiFriendlyXMLFilterTest.java | 24 +-
.../model/transform/ConsumerPomXMLFilterTest.java | 29 +-
.../model/transform/ModulesXMLFilterTest.java | 14 +-
.../maven/model/transform/ParentXMLFilterTest.java | 115 +++--
.../transform/ReactorDependencyXMLFilterTest.java | 32 +-
.../model/transform/RelativePathXMLFilterTest.java | 9 +-
.../model/transform/sax/ChainedFilterTest.java | 148 ------
.../transform/sax/CommentRenormalizerTest.java | 64 ---
.../model/transform/sax/SAXEventUtilsTest.java | 41 --
.../org/apache/maven/model/merge/ModelMerger.java | 9 +-
.../apache/maven/model/merge/ModelMergerTest.java | 21 +
.../src/main/mdo/metadata.mdo | 69 +--
maven-repository-metadata/src/site/apt/index.apt | 32 +-
.../internal/DefaultArtifactDescriptorReader.java | 16 +-
.../repository/internal/RelocatedArtifact.java | 45 +-
maven-wrapper/pom.xml | 65 ---
.../apache/maven/wrapper/BootstrapMainStarter.java | 64 ---
.../apache/maven/wrapper/DefaultDownloader.java | 190 -------
.../java/org/apache/maven/wrapper/Downloader.java | 54 --
.../java/org/apache/maven/wrapper/Installer.java | 231 ---------
.../main/java/org/apache/maven/wrapper/Logger.java | 41 --
.../org/apache/maven/wrapper/MavenWrapperMain.java | 107 ----
.../org/apache/maven/wrapper/PathAssembler.java | 131 -----
.../apache/maven/wrapper/WrapperConfiguration.java | 116 -----
.../org/apache/maven/wrapper/WrapperExecutor.java | 178 -------
maven-wrapper/src/site/apt/index.apt | 30 --
maven-wrapper/src/site/site.xml | 38 --
.../org/apache/maven/wrapper/DownloaderTest.java | 71 ---
.../org/apache/maven/wrapper/InstallerTest.java | 214 --------
.../apache/maven/wrapper/PathAssemblerTest.java | 115 -----
.../apache/maven/wrapper/WrapperExecutorTest.java | 202 --------
.../org/apache/maven/wrapper/wrapper.properties | 21 -
pom.xml | 34 +-
src/site/resources/images/maven-deps.png | Bin 160957 -> 140323 bytes
src/site/xdoc/index.xml | 73 ++-
src/site/xdoc/maven-deps.odg | Bin 22633 -> 19994 bytes
164 files changed, 2718 insertions(+), 6637 deletions(-)
create mode 100644 .github/workflows/maven_build_itself.yml
delete mode 100644 apache-maven-wrapper/pom.xml
delete mode 100644 apache-maven-wrapper/src/assembly/bin.xml
delete mode 100644 apache-maven-wrapper/src/assembly/script.xml
delete mode 100755 apache-maven-wrapper/src/assembly/script/download
delete mode 100755 apache-maven-wrapper/src/assembly/script/download.cmd
delete mode 100644 apache-maven-wrapper/src/assembly/shared/mvn/wrapper/maven-wrapper.properties
delete mode 100644 apache-maven-wrapper/src/assembly/shared/mvnwDebug
delete mode 100644 apache-maven-wrapper/src/assembly/shared/mvnwDebug.cmd
delete mode 100755 apache-maven-wrapper/src/assembly/shared/mvnwlauncher
delete mode 100755 apache-maven-wrapper/src/assembly/shared/mvnwlauncher.cmd
delete mode 100644 apache-maven-wrapper/src/assembly/source.xml
delete mode 100644 apache-maven-wrapper/src/assembly/source/download
delete mode 100644 apache-maven-wrapper/src/assembly/source/download.cmd
delete mode 100644 apache-maven-wrapper/src/assembly/source/mvn/wrapper/MavenWrapperDownloader.java
delete mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
delete mode 100644 apache-maven-wrapper/src/site/site.xml
delete mode 100644 apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EarLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EjbLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/JarLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/MavenPluginLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/PomLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/RarLifecycleMappingProvider.java
delete mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/WarLifecycleMappingProvider.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
copy maven-core/src/main/java/org/apache/maven/{artifact/handler/providers/EarArtifactHandlerProvider.java => lifecycle/providers/packaging/EarLifecycleMappingProvider.java} (51%)
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java
copy maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java => lifecycle/providers/packaging/PomLifecycleMappingProvider.java} (59%)
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java
create mode 100644 maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java
create mode 100644 maven-core/src/test/java/org/apache/maven/session/scope/internal/SessionScopeTest.java
copy maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java => maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java (64%)
delete mode 100644 maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/AbstractEventXMLFilter.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilter.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterListener.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/DependencyKey.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/RawToConsumerPomXMLFilter.java
create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/BufferingParser.java
create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/NodeBufferingParser.java
create mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/XmlUtils.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/AbstractSAXFilter.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/CommentRenormalizer.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/Factories.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEvent.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEventFactory.java
delete mode 100644 maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEventUtils.java
delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/ChainedFilterTest.java
delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/CommentRenormalizerTest.java
delete mode 100644 maven-model-transform/src/test/java/org/apache/maven/model/transform/sax/SAXEventUtilsTest.java
delete mode 100644 maven-wrapper/pom.xml
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
delete mode 100644 maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
delete mode 100644 maven-wrapper/src/site/apt/index.apt
delete mode 100644 maven-wrapper/src/site/site.xml
delete mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
delete mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
delete mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
delete mode 100644 maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
delete mode 100644 maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties
[maven] 03/03: Update startup scripts
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a4078ee616f6323a60aa1afb34a516b108e541f7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 24 20:02:20 2021 +0200
Update startup scripts
---
apache-maven/src/assembly/shared/init | 1 +
apache-maven/src/assembly/shared/init.cmd | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 619bc4d..d38f5db 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -84,3 +84,4 @@ concat_lines() {
MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
+MAVEN_ARGS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/maven.config"` $MAVEN_ARGS"
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index aac92a6..d1f6988 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -92,3 +92,11 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
:endReadJvmConfig
+set "mavenConfig=\.mvn\maven.config"
+if not exist "%MAVEN_PROJECTBASEDIR%%mavenConfig%" goto endReadMavenConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\maven.config") do set MAVEN_CONFIG_MAVEN_PROPS=!MAVEN_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set MAVEN_CONFIG_MAVEN_PROPS=%MAVEN_CONFIG_MAVEN_PROPS%
+
+:endReadMavenConfig
[maven] 01/03: Remove non-usable test
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 104dc7765a0f61d6402b1d4cebed049e6d635220
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 24 19:46:49 2021 +0200
Remove non-usable test
---
.../java/org/apache/maven/cli/MavenCliTest.java | 160 ---------------------
.../test/projects/config-illegal/.mvn/maven.config | 1 -
.../src/test/projects/config/.mvn/maven.config | 3 -
.../mavenConfigProperties/.mvn/maven.config | 5 -
4 files changed, 169 deletions(-)
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
index 3d7e385..4957cc6 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
@@ -161,166 +161,6 @@ public class MavenCliTest
}
@Test
- public void testMavenConfig()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/config" ).getCanonicalPath() );
- CliRequest request = new CliRequest( new String[0], null );
-
- // read .mvn/maven.config
- cli.initialize( request );
- cli.cli( request );
- assertEquals( "multithreaded", request.commandLine.getOptionValue( CLIManager.BUILDER ) );
- assertEquals( "8", request.commandLine.getOptionValue( CLIManager.THREADS ) );
-
- // override from command line
- request = new CliRequest( new String[]{ "--builder", "foobar" }, null );
- cli.cli( request );
- assertEquals( "foobar", request.commandLine.getOptionValue( "builder" ) );
- }
-
- @Test
- public void testMavenConfigInvalid()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/config-illegal" ).getCanonicalPath() );
- CliRequest request = new CliRequest( new String[0], null );
-
- cli.initialize( request );
- assertThrows( ParseException.class, () -> cli.cli( request ) );
- }
-
- /**
- * Read .mvn/maven.config with the following definitions:
- * <pre>
- * -T
- * 3
- * -Drevision=1.3.0
- * "-Dlabel=Apache Maven"
- * </pre>
- * and check if the {@code -T 3} option can be overwritten via command line
- * argument.
- *
- * @throws Exception in case of failure.
- */
- @Test
- public void testMVNConfigurationThreadCanBeOverwrittenViaCommandLine()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/mavenConfigProperties" ).getCanonicalPath() );
- CliRequest request = new CliRequest( new String[]{ "-T", "5" }, null );
-
- cli.initialize( request );
- // read .mvn/maven.config
- cli.cli( request );
-
- assertEquals( "5", request.commandLine.getOptionValue( CLIManager.THREADS ) );
- }
-
- /**
- * Read .mvn/maven.config with the following definitions:
- * <pre>
- * -T
- * 3
- * -Drevision=1.3.0
- * "-Dlabel=Apache Maven"
- * </pre>
- * and check if the {@code -Drevision-1.3.0} option can be overwritten via command line
- * argument.
- *
- * @throws Exception
- */
- @Test
- public void testMVNConfigurationDefinedPropertiesCanBeOverwrittenViaCommandLine()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/mavenConfigProperties" ).getCanonicalPath() );
- CliRequest request = new CliRequest( new String[]{ "-Drevision=8.1.0" }, null );
-
- cli.initialize( request );
- // read .mvn/maven.config
- cli.cli( request );
- cli.properties( request );
-
- String revision = System.getProperty( "revision" );
- assertEquals( "8.1.0", revision );
- }
-
- /**
- * Read .mvn/maven.config with the following definitions:
- * <pre>
- * -T
- * 3
- * -Drevision=1.3.0
- * "-Dlabel=Apache Maven"
- * </pre>
- * and check if the {@code -Drevision-1.3.0} option can be overwritten via command line
- * argument.
- *
- * @throws Exception
- */
- @Test
- public void testMVNConfigurationCLIRepeatedPropertiesLastWins()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/mavenConfigProperties" ).getCanonicalPath() );
- CliRequest request = new CliRequest( new String[]{ "-Drevision=8.1.0", "-Drevision=8.2.0" }, null );
-
- cli.initialize( request );
- // read .mvn/maven.config
- cli.cli( request );
- cli.properties( request );
-
- String revision = System.getProperty( "revision" );
- assertEquals( "8.2.0", revision );
- }
-
- /**
- * Read .mvn/maven.config with the following definitions:
- * <pre>
- * -T
- * 3
- * -Drevision=1.3.0
- * "-Dlabel=Apache Maven"
- * </pre>
- * and check if the {@code -Drevision-1.3.0} option can be overwritten via command line argument when there are
- * funky arguments present.
- *
- * @throws Exception
- */
- @Test
- public void testMVNConfigurationFunkyArguments()
- throws Exception
- {
- System.setProperty( MavenCli.MULTIMODULE_PROJECT_DIRECTORY,
- new File( "src/test/projects/mavenConfigProperties" ).getCanonicalPath() );
- CliRequest request = new CliRequest(
- new String[]{ "-Drevision=8.1.0", "--file=-Dpom.xml", "\"-Dfoo=bar ", "\"-Dfoo2=bar two\"",
- "-Drevision=8.2.0" }, null );
-
- cli.initialize( request );
- // read .mvn/maven.config
- cli.cli( request );
- cli.properties( request );
-
- assertEquals( "3", request.commandLine.getOptionValue( CLIManager.THREADS ) );
-
- String revision = System.getProperty( "revision" );
- assertEquals( "8.2.0", revision );
-
- assertEquals( "bar ", request.getSystemProperties().getProperty( "foo" ) );
- assertEquals( "bar two", request.getSystemProperties().getProperty( "foo2" ) );
- assertEquals( "Apache Maven", request.getSystemProperties().getProperty( "label" ) );
-
- assertEquals( "-Dpom.xml", request.getCommandLine().getOptionValue( CLIManager.ALTERNATE_POM_FILE ) );
- }
-
- @Test
public void testStyleColors()
throws Exception
{
diff --git a/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config b/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config
deleted file mode 100644
index 8541464..0000000
--- a/maven-embedder/src/test/projects/config-illegal/.mvn/maven.config
+++ /dev/null
@@ -1 +0,0 @@
-deploy
diff --git a/maven-embedder/src/test/projects/config/.mvn/maven.config b/maven-embedder/src/test/projects/config/.mvn/maven.config
deleted file mode 100644
index 280d577..0000000
--- a/maven-embedder/src/test/projects/config/.mvn/maven.config
+++ /dev/null
@@ -1,3 +0,0 @@
--T8
---builder
-multithreaded
diff --git a/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config b/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
deleted file mode 100644
index 8257023..0000000
--- a/maven-embedder/src/test/projects/mavenConfigProperties/.mvn/maven.config
+++ /dev/null
@@ -1,5 +0,0 @@
--T
-3
--Drevision=1.3.0
-"-Dlabel=Apache Maven"
-
[maven] 02/03: Remove Java code for parsing
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven.config-from-start-scripts
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 68a2c092ea295faed8a51f87ea4440936314ce67
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 24 19:47:19 2021 +0200
Remove Java code for parsing
---
.../main/java/org/apache/maven/cli/MavenCli.java | 84 +---------------------
1 file changed, 1 insertion(+), 83 deletions(-)
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 ffb9ea8..49be6d1 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
@@ -21,7 +21,6 @@ package org.apache.maven.cli;
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.UnrecognizedOptionException;
import org.apache.maven.BuildAbort;
@@ -104,8 +103,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -148,8 +145,6 @@ public class MavenCli
private static final String EXTENSIONS_FILENAME = ".mvn/extensions.xml";
- private static final String MVN_MAVEN_CONFIG = ".mvn/maven.config";
-
public static final String STYLE_COLOR_PROPERTY = "style.color";
private ClassWorld classWorld;
@@ -386,47 +381,9 @@ public class MavenCli
cliManager = new CLIManager();
- List<String> args = new ArrayList<>();
- CommandLine mavenConfig = null;
try
{
- File configFile = new File( cliRequest.multiModuleProjectDirectory, MVN_MAVEN_CONFIG );
-
- if ( configFile.isFile() )
- {
- for ( String arg : Files.readAllLines( configFile.toPath(), Charset.defaultCharset() ) )
- {
- if ( !arg.isEmpty() )
- {
- args.add( arg );
- }
- }
-
- mavenConfig = cliManager.parse( args.toArray( new String[0] ) );
- List<?> unrecongized = mavenConfig.getArgList();
- if ( !unrecongized.isEmpty() )
- {
- throw new ParseException( "Unrecognized maven.config entries: " + unrecongized );
- }
- }
- }
- catch ( ParseException e )
- {
- System.err.println( "Unable to parse maven.config: " + e.getMessage() );
- cliManager.displayHelp( System.out );
- throw e;
- }
-
- try
- {
- if ( mavenConfig == null )
- {
- cliRequest.commandLine = cliManager.parse( cliRequest.args );
- }
- else
- {
- cliRequest.commandLine = cliMerge( cliManager.parse( cliRequest.args ), mavenConfig );
- }
+ cliRequest.commandLine = cliManager.parse( cliRequest.args );
}
catch ( ParseException e )
{
@@ -458,45 +415,6 @@ public class MavenCli
}
}
- private CommandLine cliMerge( CommandLine mavenArgs, CommandLine mavenConfig )
- {
- CommandLine.Builder commandLineBuilder = new CommandLine.Builder();
-
- // the args are easy, cli first then config file
- for ( String arg : mavenArgs.getArgs() )
- {
- commandLineBuilder.addArg( arg );
- }
- for ( String arg : mavenConfig.getArgs() )
- {
- commandLineBuilder.addArg( arg );
- }
-
- // now add all options, except for -D with cli first then config file
- List<Option> setPropertyOptions = new ArrayList<>();
- for ( Option opt : mavenArgs.getOptions() )
- {
- if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
- {
- setPropertyOptions.add( opt );
- }
- else
- {
- commandLineBuilder.addOption( opt );
- }
- }
- for ( Option opt : mavenConfig.getOptions() )
- {
- commandLineBuilder.addOption( opt );
- }
- // finally add the CLI system properties
- for ( Option opt : setPropertyOptions )
- {
- commandLineBuilder.addOption( opt );
- }
- return commandLineBuilder.build();
- }
-
/**
* configure logging
*/