zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-13 07:54:46 +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

14
gradle/core/build.gradle
View file

@ -61,6 +61,17 @@ configurations {
// TODO(weiminyu): identify runtime dependencies and remove the rest. // TODO(weiminyu): identify runtime dependencies and remove the rest.
maybeRuntime maybeRuntime
closureCompiler closureCompiler
// Exclude non-canonical servlet-api jars. Our AppEngine deployment uses
// javax.servlet:servlet-api:2.5
// For reasons we do not understand, marking the following dependencies as
// compileOnly instead of compile does not exclude them from runtimeClasspath.
all {
// servlet-api:3.1 pulled in but not used by soy compiler
exclude group: 'javax.servlet', module: 'javax.servlet-api'
// Jetty's servlet-api:2.5 implementation, pulled in by other Jetty jars
exclude group: 'org.mortbay.jetty', module: 'servlet-api'
}
} }
// Known issues: // Known issues:
@ -202,7 +213,6 @@ dependencies {
testCompile deps['org.apache.sshd:sshd-scp'] testCompile deps['org.apache.sshd:sshd-scp']
maybeRuntime deps['org.apache.sshd:sshd-sftp'] maybeRuntime deps['org.apache.sshd:sshd-sftp']
testCompile deps['org.apache.sshd:sshd-sftp'] testCompile deps['org.apache.sshd:sshd-sftp']
compile deps['org.apache.tomcat:servlet-api']
maybeRuntime deps['org.apache.tomcat:tomcat-annotations-api'] maybeRuntime deps['org.apache.tomcat:tomcat-annotations-api']
testCompile deps['org.apache.tomcat:tomcat-annotations-api'] testCompile deps['org.apache.tomcat:tomcat-annotations-api']
compile deps['org.bouncycastle:bcpg-jdk15on'] compile deps['org.bouncycastle:bcpg-jdk15on']
@ -215,7 +225,6 @@ dependencies {
maybeRuntime deps['org.khronos:opengl-api'] maybeRuntime deps['org.khronos:opengl-api']
maybeRuntime deps['org.mortbay.jetty:jetty'] maybeRuntime deps['org.mortbay.jetty:jetty']
testCompile deps['org.mortbay.jetty:jetty'] testCompile deps['org.mortbay.jetty:jetty']
compile deps['org.mortbay.jetty:servlet-api']
maybeRuntime deps['org.mortbay.jetty:jetty-util'] maybeRuntime deps['org.mortbay.jetty:jetty-util']
testCompile deps['org.seleniumhq.selenium:selenium-api'] testCompile deps['org.seleniumhq.selenium:selenium-api']
testCompile deps['org.seleniumhq.selenium:selenium-chrome-driver'] testCompile deps['org.seleniumhq.selenium:selenium-chrome-driver']
@ -255,7 +264,6 @@ dependencies {
// Indirect dependency found by undeclared-dependency check. Such // Indirect dependency found by undeclared-dependency check. Such
// dependencies should go after all other compile and testCompile // dependencies should go after all other compile and testCompile
// dependencies to avoid overriding them accidentally. // dependencies to avoid overriding them accidentally.
compile deps['javax.servlet:javax.servlet-api'] // google-api-client-appeng
compile deps['com.google.oauth-client:google-oauth-client-java6'] compile deps['com.google.oauth-client:google-oauth-client-java6']
// Dependencies needed for jaxb compilation. // Dependencies needed for jaxb compilation.

3
gradle/core/gradle/dependency-locks/compile.lockfile
View file

@ -137,7 +137,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -155,7 +154,6 @@ org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0
org.apache.commons:commons-compress:1.8.1 org.apache.commons:commons-compress:1.8.1
org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpclient:4.5.5
org.apache.httpcomponents:httpcore:4.4.9 org.apache.httpcomponents:httpcore:4.4.9
org.apache.tomcat:servlet-api:6.0.45
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcprov-jdk15on:1.52 org.bouncycastle:bcprov-jdk15on:1.52
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:2.5.2
@ -168,7 +166,6 @@ org.joda:joda-money:0.10.0
org.json:json:20160810 org.json:json:20160810
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

3
gradle/core/gradle/dependency-locks/compileClasspath.lockfile
View file

@ -131,7 +131,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -149,7 +148,6 @@ org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0
org.apache.commons:commons-compress:1.8.1 org.apache.commons:commons-compress:1.8.1
org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpclient:4.5.5
org.apache.httpcomponents:httpcore:4.4.9 org.apache.httpcomponents:httpcore:4.4.9
org.apache.tomcat:servlet-api:6.0.45
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcprov-jdk15on:1.52 org.bouncycastle:bcprov-jdk15on:1.52
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:2.5.2
@ -162,7 +160,6 @@ org.joda:joda-money:0.10.0
org.json:json:20160810 org.json:json:20160810
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

3
gradle/core/gradle/dependency-locks/default.lockfile
View file

@ -140,7 +140,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -158,7 +157,6 @@ org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0
org.apache.commons:commons-compress:1.8.1 org.apache.commons:commons-compress:1.8.1
org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpclient:4.5.5
org.apache.httpcomponents:httpcore:4.4.9 org.apache.httpcomponents:httpcore:4.4.9
org.apache.tomcat:servlet-api:6.0.45
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcprov-jdk15on:1.52 org.bouncycastle:bcprov-jdk15on:1.52
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:2.5.2
@ -175,7 +173,6 @@ org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8 org.jvnet.staxex:stax-ex:1.7.8
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

1
gradle/core/gradle/dependency-locks/maybeRuntime.lockfile
View file

@ -87,7 +87,6 @@ org.codehaus.mojo:animal-sniffer-annotations:1.14
org.khronos:opengl-api:gl1.1-android-2.1_r1 org.khronos:opengl-api:gl1.1-android-2.1_r1
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.slf4j:slf4j-api:1.7.25 org.slf4j:slf4j-api:1.7.25
org.tukaani:xz:1.5 org.tukaani:xz:1.5
org.xerial.snappy:snappy-java:1.1.4 org.xerial.snappy:snappy-java:1.1.4

3
gradle/core/gradle/dependency-locks/runtime.lockfile
View file

@ -140,7 +140,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -158,7 +157,6 @@ org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0
org.apache.commons:commons-compress:1.8.1 org.apache.commons:commons-compress:1.8.1
org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpclient:4.5.5
org.apache.httpcomponents:httpcore:4.4.9 org.apache.httpcomponents:httpcore:4.4.9
org.apache.tomcat:servlet-api:6.0.45
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcprov-jdk15on:1.52 org.bouncycastle:bcprov-jdk15on:1.52
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:2.5.2
@ -175,7 +173,6 @@ org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8 org.jvnet.staxex:stax-ex:1.7.8
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

3
gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile
View file

@ -140,7 +140,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -158,7 +157,6 @@ org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.2.0
org.apache.commons:commons-compress:1.8.1 org.apache.commons:commons-compress:1.8.1
org.apache.httpcomponents:httpclient:4.5.5 org.apache.httpcomponents:httpclient:4.5.5
org.apache.httpcomponents:httpcore:4.4.9 org.apache.httpcomponents:httpcore:4.4.9
org.apache.tomcat:servlet-api:6.0.45
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcprov-jdk15on:1.52 org.bouncycastle:bcprov-jdk15on:1.52
org.checkerframework:checker-qual:2.5.2 org.checkerframework:checker-qual:2.5.2
@ -175,7 +173,6 @@ org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8 org.jvnet.staxex:stax-ex:1.7.8
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -144,7 +144,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -173,7 +172,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52 org.bouncycastle:bcpkix-jdk15on:1.52
@ -192,7 +190,6 @@ org.json:json:20160810
org.mockito:mockito-all:1.10.19 org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -139,7 +139,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA javax.validation:validation-api:1.0.0.GA
@ -168,7 +167,6 @@ org.apache.mina:mina-core:2.0.4
org.apache.sshd:sshd-core:2.0.0 org.apache.sshd:sshd-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-jdk15on:1.52 org.bouncycastle:bcpkix-jdk15on:1.52
@ -187,7 +185,6 @@ org.json:json:20160810
org.mockito:mockito-all:1.10.19 org.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

3
gradle/dependencies.gradle
View file

@ -98,7 +98,6 @@ ext {
'javax.annotation:jsr250-api:1.0', 'javax.annotation:jsr250-api:1.0',
'javax.inject:javax.inject:1', 'javax.inject:javax.inject:1',
'javax.mail:mail:1.4', 'javax.mail:mail:1.4',
'javax.servlet:javax.servlet-api:3.1.0',
'javax.servlet:servlet-api:2.5', 'javax.servlet:servlet-api:2.5',
'javax.xml.bind:jaxb-api:2.3.0', 'javax.xml.bind:jaxb-api:2.3.0',
'javax.xml.soap:javax.xml.soap-api:1.4.0', 'javax.xml.soap:javax.xml.soap-api:1.4.0',
@ -122,7 +121,6 @@ ext {
'org.apache.sshd:sshd-core:2.0.0', 'org.apache.sshd:sshd-core:2.0.0',
'org.apache.sshd:sshd-scp:2.0.0', 'org.apache.sshd:sshd-scp:2.0.0',
'org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5',
'org.bouncycastle:bcpg-jdk15on:1.52', 'org.bouncycastle:bcpg-jdk15on:1.52',
'org.bouncycastle:bcpkix-jdk15on:1.52', 'org.bouncycastle:bcpkix-jdk15on:1.52',
@ -139,7 +137,6 @@ ext {
'org.mockito:mockito-all:1.10.19', 'org.mockito:mockito-all:1.10.19',
'org.mortbay.jetty:jetty:6.1.26', 'org.mortbay.jetty:jetty:6.1.26',
'org.mortbay.jetty:jetty-util:6.1.26', 'org.mortbay.jetty:jetty-util:6.1.26',
'org.mortbay.jetty:servlet-api:2.5-20081211',
'org.seleniumhq.selenium:selenium-api:3.141.59', 'org.seleniumhq.selenium:selenium-api:3.141.59',
'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59', 'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59',
'org.seleniumhq.selenium:selenium-java:3.141.59', 'org.seleniumhq.selenium:selenium-java:3.141.59',

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.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons: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.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons: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.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons: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.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -142,7 +142,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0

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

@ -147,7 +147,6 @@ javax.annotation:jsr250-api:1.0
javax.inject:javax.inject:1 javax.inject:javax.inject:1
javax.jdo:jdo2-api:2.3-eb javax.jdo:jdo2-api:2.3-eb
javax.mail:mail:1.4 javax.mail:mail:1.4
javax.servlet:javax.servlet-api:3.1.0
javax.servlet:servlet-api:2.5 javax.servlet:servlet-api:2.5
javax.transaction:transaction-api:1.1 javax.transaction:transaction-api:1.1
javax.validation:validation-api:1.0.0.GA 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-core:2.0.0
org.apache.sshd:sshd-scp:2.0.0 org.apache.sshd:sshd-scp:2.0.0
org.apache.sshd:sshd-sftp: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.apache.tomcat:tomcat-annotations-api:8.0.5
org.bouncycastle:bcpg-jdk15on:1.52 org.bouncycastle:bcpg-jdk15on:1.52
org.bouncycastle:bcpkix-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.mockito:mockito-all:1.10.19
org.mortbay.jetty:jetty-util:6.1.26 org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26 org.mortbay.jetty:jetty:6.1.26
org.mortbay.jetty:servlet-api:2.5-20081211
org.objenesis:objenesis:1.2 org.objenesis:objenesis:1.2
org.ow2.asm:asm-analysis:6.0 org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0 org.ow2.asm:asm-commons:6.0