You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/02/12 18:03:22 UTC
[maven-artifact-transfer] branch MSHARED-682 created (now abc2d0e)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-682
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git.
at abc2d0e [MSHARED-682] - Upgrade maven-shared-components parent to version 31 o Removed inherited versions which had been overwritten previously. o Cleaned up pom o Added enhancement of the excludes list for apache-rat-plugin o Fixed checkstyle issue related to the upgrade.
This branch includes the following new commits:
new abc2d0e [MSHARED-682] - Upgrade maven-shared-components parent to version 31 o Removed inherited versions which had been overwritten previously. o Cleaned up pom o Added enhancement of the excludes list for apache-rat-plugin o Fixed checkstyle issue related to the upgrade.
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.
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-artifact-transfer] 01/01: [MSHARED-682] - Upgrade
maven-shared-components parent to version 31 o Removed inherited versions
which had been overwritten previously. o Cleaned up pom o Added enhancement
of the excludes list for apache-rat-plugin o Fixed checkstyle issue related
to the upgrade.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-682
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit abc2d0e2a9bca03014708ccf5fdebe5e0f732860
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Mon Feb 12 19:02:03 2018 +0100
[MSHARED-682] - Upgrade maven-shared-components parent to version 31
o Removed inherited versions which had been overwritten previously.
o Cleaned up pom
o Added enhancement of the excludes list for apache-rat-plugin
o Fixed checkstyle issue related to the upgrade.
---
pom.xml | 13 +++++++++----
.../artifact/resolve/internal/Maven30ArtifactResult.java | 2 +-
.../resolve/internal/Maven30ArtifactResult.java | 2 +-
.../internal/Maven30DependencyResolverException.java | 2 +-
.../resolve/internal/Maven31ArtifactResult.java | 2 +-
.../internal/Maven31DependencyResolverException.java | 2 +-
6 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 800b1b7..01719f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>30</version>
+ <version>31</version>
<relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
</parent>
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
<executions>
<execution>
<goals>
@@ -73,7 +72,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
+ <!--
+ ! explicit overwrite cause otherwise we get an 2.4.3...instead.
+ -->
+ <version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -107,6 +109,10 @@
<configuration>
<excludes combine.children="append">
<exclude>dependency-reduced-pom.xml</exclude>
+ <exclude>src/it/**/.settings/**</exclude>
+ <exclude>src/it/**/.project</exclude>
+ <exclude>src/it/**/.classpath</exclude>
+ <exclude>src/it/**/target/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -165,7 +171,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
- <version>1.7.1</version>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
index c9169b3..3118036 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
@@ -38,7 +38,7 @@ public class Maven30ArtifactResult
/**
* @param artifactResult {@link ArtifactResult}
*/
- public Maven30ArtifactResult( ArtifactResult artifactResult )
+ Maven30ArtifactResult( ArtifactResult artifactResult )
{
this.artifactResult = artifactResult;
}
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
index 70cfa14..f3274f9 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
@@ -38,7 +38,7 @@ class Maven30ArtifactResult
/**
* @param artifactResult {@link ArtifactResult}
*/
- public Maven30ArtifactResult( ArtifactResult artifactResult )
+ Maven30ArtifactResult( ArtifactResult artifactResult )
{
this.artifactResult = artifactResult;
}
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
index 450e6b8..23145e4 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
@@ -43,7 +43,7 @@ class Maven30DependencyResolverException extends DependencyResolverException
this.dce = e;
}
- public Maven30DependencyResolverException( ArtifactResolutionException e )
+ Maven30DependencyResolverException( ArtifactResolutionException e )
{
super( e );
this.are = e;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
index c86e587..b3d887f 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
@@ -38,7 +38,7 @@ class Maven31ArtifactResult
/**
* @param artifactResult {@link ArtifactResult}
*/
- public Maven31ArtifactResult( ArtifactResult artifactResult )
+ Maven31ArtifactResult( ArtifactResult artifactResult )
{
this.artifactResult = artifactResult;
}
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
index 995fe48..833f2a1 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
+++ b/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
@@ -34,7 +34,7 @@ class Maven31DependencyResolverException extends DependencyResolverException
{
private DependencyResolutionException e;
- public Maven31DependencyResolverException( DependencyResolutionException e )
+ Maven31DependencyResolverException( DependencyResolutionException e )
{
super( e );
this.e = e;
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.