zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-26 04:28:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ensure gradle build has only one servlet-api

Browse source 
Use javax.servlet:servlet-api:2.5 and exclude all other implementations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=237505707
This commit is contained in:
weiminyu 2019-03-08 13:11:41 -08:00 • committed by jianglai
parent 27c1765ab4
commit eb8d80f7ad
20 changed files with 11 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gradle/proxy/gradle/dependency-locks/testCompile.lockfile
View file

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA
@ -176,7 +175,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp:2.0.0
org.apache.tomcat:servlet-api:6.0.45
org.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52
@ -199,7 +197,6 @@ org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0

3
gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
View file

@ -142,7 +142,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA
@ -171,7 +170,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp:2.0.0
org.apache.tomcat:servlet-api:6.0.45
org.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52
@ -194,7 +192,6 @@ org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0

3
gradle/proxy/gradle/dependency-locks/testRuntime.lockfile
View file

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA
@ -176,7 +175,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp:2.0.0
org.apache.tomcat:servlet-api:6.0.45
org.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52
@ -199,7 +197,6 @@ org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0

3
gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA
@ -176,7 +175,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp:2.0.0
org.apache.tomcat:servlet-api:6.0.45
org.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52
@ -199,7 +197,6 @@ org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0