GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Exclude tomcat-annotations-api and use javax.annotations-api instead 

Closes gh-10133
pull/11487/merge
Andy Wilkinson 8 years ago
parent
a7808388ad
commit
0aedd3f11d
8 changed files with 10 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
  2. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
  3. 1
      spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
  4. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
  5. 10
      spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
  6. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml
  7. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml
  8. 22
      spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml

22
spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
Unescape View File

@ -38,26 +38,4 @@ @@ -38,26 +38,4 @@
</exclusions>
</dependency>
</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>

22
spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
Unescape View File

@ -27,26 +27,4 @@ @@ -27,26 +27,4 @@
<artifactId>spring-context-support</artifactId>
</dependency>
</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>

1
spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
Unescape View File

@ -41,7 +41,6 @@ @@ -41,7 +41,6 @@
</goals>
<configuration>
<ignoredClassPatterns>
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
<ignoredClassPattern>module-info</ignoredClassPattern>
</ignoredClassPatterns>
</configuration>

22
spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
Unescape View File

@ -28,26 +28,4 @@ @@ -28,26 +28,4 @@
<artifactId>spring-plugin-core</artifactId>
</dependency>
</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>

10
spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
Unescape View File

@ -15,9 +15,19 @@ @@ -15,9 +15,19 @@
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>

22
spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml
Unescape View File

@ -31,26 +31,4 @@ @@ -31,26 +31,4 @@
<artifactId>spring-ws-core</artifactId>
</dependency>
</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>

22
spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml
Unescape View File

@ -40,26 +40,4 @@ @@ -40,26 +40,4 @@
<artifactId>spring-webmvc</artifactId>
</dependency>
</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>

22
spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml
Unescape View File

@ -32,26 +32,4 @@ @@ -32,26 +32,4 @@
<artifactId>spring-websocket</artifactId>
</dependency>
</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>

Write Preview
Loading…
Cancel
Save