You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2019/10/23 12:53:28 UTC
[maven] branch reproducible2 created (now c35c8bc)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch reproducible2
in repository https://gitbox.apache.org/repos/asf/maven.git.
at c35c8bc exclude IDE files that may pollute source archive
This branch includes the following new commits:
new 7e24ef8 use plexus-metadata 2.1.0 that fixes merging reprodicibility
new 328f068 temporary hack: disable sisu-maven-plugin
new c35c8bc exclude IDE files that may pollute source archive
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.
[maven] 02/03: temporary hack: disable sisu-maven-plugin
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch reproducible2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 328f06807104fa3d949e5bb64013be00e9d87dc7
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Sep 22 12:19:23 2019 +0200
temporary hack: disable sisu-maven-plugin
waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
---
maven-core/pom.xml | 4 +++-
.../resources/META-INF/sisu/javax.inject.Named | 13 +++++++++++
maven-embedder/pom.xml | 4 +++-
.../resources/META-INF/sisu/javax.inject.Named | 2 ++
maven-model-builder/pom.xml | 4 +++-
.../resources/META-INF/sisu/javax.inject.Named | 27 ++++++++++++++++++++++
maven-resolver-provider/pom.xml | 4 +++-
.../resources/META-INF/sisu/javax.inject.Named | 5 ++++
maven-settings-builder/pom.xml | 4 +++-
.../resources/META-INF/sisu/javax.inject.Named | 5 ++++
pom.xml | 1 +
11 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 73c53c4..5dc4098 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -196,10 +196,12 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
</plugin>
+ <!-- disable plugin in favor of src/main/resources/META-INF/sisu/javax.inject.Named
+ while waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
diff --git a/maven-core/src/main/resources/META-INF/sisu/javax.inject.Named b/maven-core/src/main/resources/META-INF/sisu/javax.inject.Named
new file mode 100644
index 0000000..ad4854e
--- /dev/null
+++ b/maven-core/src/main/resources/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,13 @@
+org.apache.maven.internal.aether.DefaultRepositorySystemSessionFactory
+org.apache.maven.DefaultArtifactFilterManager
+org.apache.maven.toolchain.building.DefaultToolchainsBuilder
+org.apache.maven.ReactorReader
+org.apache.maven.lifecycle.internal.DefaultProjectArtifactFactory
+org.apache.maven.toolchain.io.DefaultToolchainsReader
+org.apache.maven.execution.scope.internal.MojoExecutionScopeCoreModule
+org.apache.maven.classrealm.DefaultClassRealmManager
+org.apache.maven.execution.DefaultMavenExecutionRequestPopulator
+org.apache.maven.lifecycle.internal.LifecycleDependencyResolver
+org.apache.maven.session.scope.internal.SessionScopeModule
+org.apache.maven.extension.internal.CoreExportsProvider
+org.apache.maven.toolchain.io.DefaultToolchainsWriter
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 9c00974..a73bf44 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -193,10 +193,12 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
+ <!-- disable plugin in favor of src/main/resources/META-INF/sisu/javax.inject.Named
+ while waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
diff --git a/maven-embedder/src/main/resources/META-INF/sisu/javax.inject.Named b/maven-embedder/src/main/resources/META-INF/sisu/javax.inject.Named
new file mode 100644
index 0000000..db80b06
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,2 @@
+org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor
+org.apache.maven.cli.internal.BootstrapCoreExtensionManager
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 3861eb4..be966a6 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -93,10 +93,12 @@ under the License.
<build>
<plugins>
+ <!-- disable plugin in favor of src/main/resources/META-INF/sisu/javax.inject.Named
+ while waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- </plugin>
+ </plugin-->
</plugins>
</build>
diff --git a/maven-model-builder/src/main/resources/META-INF/sisu/javax.inject.Named b/maven-model-builder/src/main/resources/META-INF/sisu/javax.inject.Named
new file mode 100644
index 0000000..30e36cd
--- /dev/null
+++ b/maven-model-builder/src/main/resources/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,27 @@
+org.apache.maven.model.building.DefaultModelBuilder
+org.apache.maven.model.validation.DefaultModelValidator
+org.apache.maven.model.profile.activation.PropertyProfileActivator
+org.apache.maven.model.path.DefaultModelUrlNormalizer
+org.apache.maven.model.locator.DefaultModelLocator
+org.apache.maven.model.profile.activation.OperatingSystemProfileActivator
+org.apache.maven.model.plugin.DefaultReportConfigurationExpander
+org.apache.maven.model.interpolation.StringSearchModelInterpolator
+org.apache.maven.model.profile.activation.FileProfileActivator
+org.apache.maven.model.management.DefaultDependencyManagementInjector
+org.apache.maven.model.io.DefaultModelWriter
+org.apache.maven.model.building.DefaultModelProcessor
+org.apache.maven.model.path.DefaultPathTranslator
+org.apache.maven.model.composition.DefaultDependencyManagementImporter
+org.apache.maven.model.interpolation.StringVisitorModelInterpolator
+org.apache.maven.model.profile.DefaultProfileSelector
+org.apache.maven.model.inheritance.DefaultInheritanceAssembler
+org.apache.maven.model.plugin.DefaultReportingConverter
+org.apache.maven.model.profile.DefaultProfileInjector
+org.apache.maven.model.path.DefaultModelPathTranslator
+org.apache.maven.model.profile.activation.JdkVersionProfileActivator
+org.apache.maven.model.superpom.DefaultSuperPomProvider
+org.apache.maven.model.path.DefaultUrlNormalizer
+org.apache.maven.model.normalization.DefaultModelNormalizer
+org.apache.maven.model.plugin.DefaultPluginConfigurationExpander
+org.apache.maven.model.management.DefaultPluginManagementInjector
+org.apache.maven.model.io.DefaultModelReader
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 3180d9a..d1655ec 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -121,10 +121,12 @@ under the License.
<build>
<plugins>
+ <!-- disable plugin in favor of src/main/resources/META-INF/sisu/javax.inject.Named
+ while waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- </plugin>
+ </plugin-->
</plugins>
</build>
diff --git a/maven-resolver-provider/src/main/resources/META-INF/sisu/javax.inject.Named b/maven-resolver-provider/src/main/resources/META-INF/sisu/javax.inject.Named
new file mode 100644
index 0000000..4a5a3e5
--- /dev/null
+++ b/maven-resolver-provider/src/main/resources/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,5 @@
+org.apache.maven.repository.internal.DefaultVersionRangeResolver
+org.apache.maven.repository.internal.DefaultVersionResolver
+org.apache.maven.repository.internal.DefaultArtifactDescriptorReader
+org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory
+org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index a6ac8fb..401ba03 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -69,10 +69,12 @@ under the License.
<build>
<plugins>
+ <!-- disable plugin in favor of src/main/resources/META-INF/sisu/javax.inject.Named
+ while waiting for a release of https://github.com/eclipse/sisu.inject/pull/5
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- </plugin>
+ </plugin-->
</plugins>
</build>
diff --git a/maven-settings-builder/src/main/resources/META-INF/sisu/javax.inject.Named b/maven-settings-builder/src/main/resources/META-INF/sisu/javax.inject.Named
new file mode 100644
index 0000000..1488b4c
--- /dev/null
+++ b/maven-settings-builder/src/main/resources/META-INF/sisu/javax.inject.Named
@@ -0,0 +1,5 @@
+org.apache.maven.settings.io.DefaultSettingsReader
+org.apache.maven.settings.io.DefaultSettingsWriter
+org.apache.maven.settings.building.DefaultSettingsBuilder
+org.apache.maven.settings.crypto.DefaultSettingsDecrypter
+org.apache.maven.settings.validation.DefaultSettingsValidator
diff --git a/pom.xml b/pom.xml
index 22922fd..7651c91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,6 +536,7 @@ under the License.
<exclude>src/test/projects/**</exclude>
<exclude>src/test/remote-repo/**</exclude>
<exclude>**/*.odg</exclude>
+ <exclude>src/main/resources/META-INF/sisu/javax.inject.Named</exclude>
<!--
! Excluded the license files itself cause they do not have have a license of themselfs.
-->
[maven] 03/03: exclude IDE files that may pollute source archive
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch reproducible2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c35c8bcbc8753ab32cb0d477cf20f939728f79e0
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Sep 28 18:21:52 2019 +0200
exclude IDE files that may pollute source archive
---
apache-maven/src/main/assembly/src.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/apache-maven/src/main/assembly/src.xml b/apache-maven/src/main/assembly/src.xml
index 6ca2550..45fc78b 100644
--- a/apache-maven/src/main/assembly/src.xml
+++ b/apache-maven/src/main/assembly/src.xml
@@ -35,6 +35,14 @@ under the License.
<exclude>**/.gitattributes</exclude>
<exclude>init-git-svn.sh</exclude>
<exclude>**/.repository/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/.DS_Store</exclude>
+ <exclude>**/build/**</exclude>
</excludes>
</fileSet>
<fileSet>
[maven] 01/03: use plexus-metadata 2.1.0 that fixes merging
reprodicibility
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch reproducible2
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7e24ef8c2a5fc9fd8fa69c84789df318a3e03c40
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Oct 23 14:52:36 2019 +0200
use plexus-metadata 2.1.0 that fixes merging reprodicibility
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c93f185..22922fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@ under the License.
<commonsLangVersion>3.8.1</commonsLangVersion>
<junitVersion>4.12</junitVersion>
<mockitoVersion>2.21.0</mockitoVersion>
- <plexusVersion>2.0.0</plexusVersion>
+ <plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.25</plexusInterpolationVersion>
<plexusUtilsVersion>3.2.1</plexusUtilsVersion>
<guiceVersion>4.2.1</guiceVersion>