You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2018/06/18 22:03:41 UTC
[commons-weaver] branch master updated (fb1c27d -> d0bf4bd)
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git.
from fb1c27d Merge remote-tracking branch 'origin/master'
new 4077c37 roll back japicmp version due to #210
new 753f164 disable japicmp for build-tools module
new d0bf4bd move japicmp exclusions to pluginManagement (apply same config to mojo, report); alignment
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:
build-tools/pom.xml | 11 ++++
modules/normalizer/pom.xml | 30 ++++++----
modules/privilizer/weaver/pom.xml | 122 ++++++++++++++++++++------------------
pom.xml | 2 +-
4 files changed, 92 insertions(+), 73 deletions(-)
[commons-weaver] 02/03: disable japicmp for build-tools module
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 753f16476f727bec639f289d083d5dc0b9fdb326
Author: Matt Benson <mb...@apache.org>
AuthorDate: Mon Jun 18 16:55:01 2018 -0500
disable japicmp for build-tools module
---
build-tools/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index aadf121..d27a395 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -35,6 +35,17 @@ under the License.
</scm>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
[commons-weaver] 03/03: move japicmp exclusions to pluginManagement
(apply same config to mojo, report); alignment
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit d0bf4bdaf1f4644e091dcd11236b439395f1d06a
Author: Matt Benson <mb...@apache.org>
AuthorDate: Mon Jun 18 17:03:17 2018 -0500
move japicmp exclusions to pluginManagement (apply same config to mojo, report); alignment
---
modules/normalizer/pom.xml | 30 ++++++----
modules/privilizer/weaver/pom.xml | 122 ++++++++++++++++++++------------------
2 files changed, 80 insertions(+), 72 deletions(-)
diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index ffeb875..9898571 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -78,6 +78,23 @@ under the License.
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <configuration>
+ <parameter>
+ <excludes>
+ <exclude>org.apache.commons.weaver.normalizer._asm</exclude>
+ <exclude>org.apache.commons.weaver.normalizer._io</exclude>
+ <exclude>org.apache.commons.weaver.normalizer._lang3</exclude>
+ </excludes>
+ </parameter>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<!-- shade plugin creates but does not clean ${project.basedir}/dependency-reduced-pom.xml -->
<plugin>
@@ -146,19 +163,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <configuration>
- <parameter>
- <excludes>
- <exclude>org.apache.commons.weaver.normalizer._asm</exclude>
- <exclude>org.apache.commons.weaver.normalizer._io</exclude>
- <exclude>org.apache.commons.weaver.normalizer._lang3</exclude>
- </excludes>
- </parameter>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml
index c2b0d97..54178f0 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -73,6 +73,23 @@ under the License.
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <configuration>
+ <parameter>
+ <excludes>
+ <exclude>org.apache.commons.weaver.privilizer._asm</exclude>
+ <exclude>org.apache.commons.weaver.privilizer._io</exclude>
+ <exclude>org.apache.commons.weaver.privilizer._lang3</exclude>
+ </excludes>
+ </parameter>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
@@ -128,65 +145,52 @@ under the License.
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>shade</id>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <minimizeJar>true</minimizeJar>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <artifactSet>
- <includes>
- <include>org.apache.commons:commons-lang3</include>
- <include>org.ow2.asm:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.apache.commons.lang3.</pattern>
- <shadedPattern>org.apache.commons.weaver.privilizer._lang3.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.objectweb.asm.</pattern>
- <shadedPattern>org.apache.commons.weaver.privilizer._asm.</shadedPattern>
- </relocation>
- </relocations>
- <filters>
- <filter>
- <artifact>org.apache.commons:commons-lang3</artifact>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.ow2.asm:*</artifact>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.siom79.japicmp</groupId>
- <artifactId>japicmp-maven-plugin</artifactId>
- <configuration>
- <parameter>
- <excludes>
- <exclude>org.apache.commons.weaver.privilizer._asm</exclude>
- <exclude>org.apache.commons.weaver.privilizer._io</exclude>
- <exclude>org.apache.commons.weaver.privilizer._lang3</exclude>
- </excludes>
- </parameter>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <artifactSet>
+ <includes>
+ <include>org.apache.commons:commons-lang3</include>
+ <include>org.ow2.asm:*</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.lang3.</pattern>
+ <shadedPattern>org.apache.commons.weaver.privilizer._lang3.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.objectweb.asm.</pattern>
+ <shadedPattern>org.apache.commons.weaver.privilizer._asm.</shadedPattern>
+ </relocation>
+ </relocations>
+ <filters>
+ <filter>
+ <artifact>org.apache.commons:commons-lang3</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.ow2.asm:*</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<reporting>
[commons-weaver] 01/03: roll back japicmp version due to #210
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 4077c37589090b69a364ab720cb0fd14dda61ac4
Author: Matt Benson <mb...@apache.org>
AuthorDate: Mon Jun 18 16:49:20 2018 -0500
roll back japicmp version due to #210
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9c9f016..cf92b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
<commons.site.path>commons-weaver</commons.site.path>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}</commons.scmPubUrl>
- <commons.japicmp.version>0.12.0</commons.japicmp.version>
+ <commons.japicmp.version>0.11.1</commons.japicmp.version>
<!-- most Java-related items are defined in parent/pom.xml;
define these here for the animal-sniffer config of commons-parent: -->