Merge remote-tracking branch 'origin/master'
diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index d6d408a..ffeb875 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -109,7 +109,6 @@
<artifactSet>
<includes>
<include>org.apache.commons:commons-lang3</include>
- <include>commons-io:commons-io</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
@@ -119,10 +118,6 @@
<shadedPattern>org.apache.commons.weaver.normalizer._lang3.</shadedPattern>
</relocation>
<relocation>
- <pattern>org.apache.commons.io.</pattern>
- <shadedPattern>org.apache.commons.weaver.normalizer._io.</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.objectweb.asm.</pattern>
<shadedPattern>org.apache.commons.weaver.normalizer._asm.</shadedPattern>
</relocation>
@@ -151,6 +146,19 @@
</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 b8e9301..c2b0d97 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -174,6 +174,19 @@
</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>
</plugins>
</build>
<reporting>
diff --git a/pom.xml b/pom.xml
index cf92b95..9c9f016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<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.11.1</commons.japicmp.version>
+ <commons.japicmp.version>0.12.0</commons.japicmp.version>
<!-- most Java-related items are defined in parent/pom.xml;
define these here for the animal-sniffer config of commons-parent: -->
