Skip to content

S
spring-boot
Commit 674170a3 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch 'gh-9366'

parents db0c4185 5d67ae4d
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 0 deletions
spring-boot-dependencies/pom.xml
View file @ 674170a3
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
<jackson.version>2.9.1</jackson.version> <jackson.version>2.9.1</jackson.version>
<janino.version>3.0.7</janino.version> <janino.version>3.0.7</janino.version>
<javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate --> <javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate -->
<javax-annotation.version>1.3</javax-annotation.version>
<javax-cache.version>1.0.0</javax-cache.version> <javax-cache.version>1.0.0</javax-cache.version>
<javax-jms.version>2.0.1</javax-jms.version> <javax-jms.version>2.0.1</javax-jms.version>
<javax-mail.version>1.6.0</javax-mail.version> <javax-mail.version>1.6.0</javax-mail.version>
...@@ -874,6 +875,11 @@ ...@@ -874,6 +875,11 @@
<artifactId>undertow-websockets-jsr</artifactId> <artifactId>undertow-websockets-jsr</artifactId>
<version>${undertow.version}</version> <version>${undertow.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.cache</groupId> <groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId> <artifactId>cache-api</artifactId>
......
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
View file @ 674170a3
...@@ -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>
......
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-hateoas/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-mobile/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-web-services/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-web/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter-websocket/pom.xml
View file @ 674170a3
...@@ -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>
spring-boot-starters/spring-boot-starter/pom.xml
View file @ 674170a3
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
......
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