Commit 5d67ae4d authored by Andy Wilkinson's avatar Andy Wilkinson

Ignore duplicate javax.annotation classes from tomcat-embed-core

See gh-9366
parent c082e31d
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<goal>check</goal> <goal>check</goal>
</goals> </goals>
<configuration> <configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
<ignoredResourcePatterns> <ignoredResourcePatterns>
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern> <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
</ignoredResourcePatterns> </ignoredResourcePatterns>
......
...@@ -35,4 +35,26 @@ ...@@ -35,4 +35,26 @@
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -31,4 +31,26 @@ ...@@ -31,4 +31,26 @@
<artifactId>groovy-templates</artifactId> <artifactId>groovy-templates</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -32,4 +32,26 @@ ...@@ -32,4 +32,26 @@
<artifactId>spring-plugin-core</artifactId> <artifactId>spring-plugin-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -31,4 +31,26 @@ ...@@ -31,4 +31,26 @@
<artifactId>spring-mobile-device</artifactId> <artifactId>spring-mobile-device</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -43,4 +43,26 @@ ...@@ -43,4 +43,26 @@
<artifactId>spring-social-facebook</artifactId> <artifactId>spring-social-facebook</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -43,4 +43,26 @@ ...@@ -43,4 +43,26 @@
<artifactId>spring-social-linkedin</artifactId> <artifactId>spring-social-linkedin</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -43,4 +43,26 @@ ...@@ -43,4 +43,26 @@
<artifactId>spring-social-twitter</artifactId> <artifactId>spring-social-twitter</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -35,4 +35,26 @@ ...@@ -35,4 +35,26 @@
<artifactId>spring-ws-core</artifactId> <artifactId>spring-ws-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -44,4 +44,26 @@ ...@@ -44,4 +44,26 @@
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -36,4 +36,26 @@ ...@@ -36,4 +36,26 @@
<artifactId>spring-websocket</artifactId> <artifactId>spring-websocket</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.basepom.maven</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<executions>
<execution>
<id>duplicate-dependencies</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment