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 <mben...@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>
