Skip to content

Commit fa01c84

Browse files
jjohannesjjohannes
committed
Align Sample ALL and DEACTIVATED
1 parent 522ed23 commit fa01c84

File tree

4 files changed

+43
-48
lines changed

4 files changed

+43
-48
lines changed

‎samples/sample-all-deactivated/build.gradle.kts‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
implementation("com.miglayout:miglayout-swing:5.0")
2525
implementation("com.miglayout:miglayout:3.7.4")
2626
implementation("com.mysql:mysql-connector-j:8.3.0")
27+
implementation("com.sun.activation:jakarta.activation:2.0.1")
2728
implementation("com.sun.activation:javax.activation:1.2.0")
2829
implementation("com.sun.mail:jakarta.mail:2.0.1")
2930
implementation("com.sun.mail:javax.mail:1.6.2")
@@ -36,12 +37,11 @@ dependencies {
3637
implementation("com.zaxxer:HikariCP:5.0.1")
3738
implementation("commons-beanutils:commons-beanutils-core:1.8.3")
3839
implementation("commons-beanutils:commons-beanutils:1.9.4")
39-
implementation("commons-collections:commons-collections:3.2.2")
4040
implementation("commons-io:commons-io:2.11.0")
4141
implementation("commons-logging:commons-logging:1.3.0")
4242
implementation("dom4j:dom4j:1.6.1")
43-
implementation("jakarta.activation:jakarta.activation-api:2.1.0")
44-
implementation("jakarta.annotation:jakarta.annotation-api:1.3.5")
43+
implementation("jakarta.activation:jakarta.activation-api:2.0.0")
44+
implementation("jakarta.annotation:jakarta.annotation-api:2.1.1")
4545
implementation("jakarta.ejb:jakarta.ejb-api:3.2.6")
4646
implementation("jakarta.el:jakarta.el-api:3.0.3")
4747
implementation("jakarta.inject:jakarta.inject-api:1.0.5")
@@ -51,13 +51,12 @@ dependencies {
5151
implementation("jakarta.persistence:jakarta.persistence-api:2.2.3")
5252
implementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7")
5353
implementation("jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6")
54-
implementation("jakarta.servlet:jakarta.servlet-api:4.0.4")
55-
implementation("jakarta.transaction:jakarta.transaction-api:2.0.1")
54+
implementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
5655
implementation("jakarta.transaction:jakarta.transaction-api:2.0.1")
5756
implementation("jakarta.validation:jakarta.validation-api:2.0.1")
58-
implementation("jakarta.websocket:jakarta.websocket-api:2.1.0")
59-
implementation("jakarta.websocket:jakarta.websocket-client-api:2.1.0")
60-
implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.0.0")
57+
// implementation("jakarta.websocket:jakarta.websocket-api:2.1.1") - Expected to find a selector with a failure but none was found
58+
implementation("jakarta.websocket:jakarta.websocket-client-api:2.1.1")
59+
implementation("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")
6160
implementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3")
6261
implementation("jakarta.xml.soap:jakarta.xml.soap-api:1.4.2")
6362
implementation("jakarta.xml.ws:jakarta.xml.ws-api:2.3.3")
@@ -86,17 +85,15 @@ dependencies {
8685
implementation("javax.servlet:jstl:1.2")
8786
implementation("javax.servlet:servlet-api:2.5")
8887
implementation("javax.transaction:javax.transaction-api:1.3")
89-
implementation("javax.transaction:javax.transaction-api:1.3")
90-
implementation("javax.transaction:jta:1.1")
9188
implementation("javax.transaction:jta:1.1")
9289
implementation("javax.validation:validation-api:2.0.1.Final")
9390
implementation("javax.websocket:javax.websocket-api:1.1")
94-
implementation("javax.websocket:javax.websocket-client-api:1.1")
91+
implementation("javax.websocket:javax.websocket-client-api:1.0")
9592
implementation("javax.ws.rs:javax.ws.rs-api:2.1.1")
9693
implementation("javax.ws.rs:jsr311-api:1.1.1")
9794
implementation("javax.xml.bind:jaxb-api:2.3.1")
9895
implementation("javax.xml.soap:javax.xml.soap-api:1.4.0")
99-
implementation("javax.xml.stream:stax-api:1.0-2")
96+
implementation("javax.xml.stream:stax-api:1.0")
10097
implementation("javax.xml.ws:jaxws-api:2.3.1")
10198
implementation("jboss:javassist:3.8.0.GA")
10299
implementation("junit:junit-dep:4.8")
@@ -126,16 +123,18 @@ dependencies {
126123
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0")
127124
implementation("org.apache.logging.log4j:log4j-to-slf4j:2.23.0")
128125
implementation("org.apache.solr:solr-commons-csv:3.5.0")
129-
implementation("org.apache.tomcat.embed:tomcat-embed-core:9.0.1")
130-
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:9.0.1")
126+
implementation("org.apache.tomcat.embed:tomcat-embed-core:10.1.0")
127+
implementation("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0")
131128
implementation("org.apache.tomcat:servlet-api:6.0.53")
132-
implementation("org.apache.tomcat:tomcat-annotations-api:9.0.1")
133-
implementation("org.apache.tomcat:tomcat-servlet-api:9.0.1")
129+
implementation("org.apache.tomcat:tomcat-annotations-api:10.1.1")
130+
implementation("org.apache.tomcat:tomcat-servlet-api:10.1.1")
134131
implementation("org.apache.tomcat:tomcat-websocket-api:10.1.0")
135132
implementation("org.apache.tomcat:tomcat-websocket-client-api:10.1.0")
136133
implementation("org.apache.tomcat:tomcat-websocket:10.1.1")
137134
implementation("org.apache.velocity:velocity-engine-core:2.3")
138135
implementation("org.apache.velocity:velocity:1.7")
136+
implementation("org.bouncycastle:bc-fips-debug:1.0.2.3")
137+
implementation("org.bouncycastle:bc-fips:1.0.2.3")
139138
implementation("org.bouncycastle:bcjmail-jdk15on:1.70")
140139
implementation("org.bouncycastle:bcjmail-jdk15to18:1.70")
141140
implementation("org.bouncycastle:bcjmail-jdk18on:1.72")
@@ -147,6 +146,7 @@ dependencies {
147146
implementation("org.bouncycastle:bcmail-jdk15to18:1.70")
148147
implementation("org.bouncycastle:bcmail-jdk16:1.46")
149148
implementation("org.bouncycastle:bcmail-jdk18on:1.71")
149+
implementation("org.bouncycastle:bcpg-fips:1.0.6")
150150
implementation("org.bouncycastle:bcpg-jdk12:130")
151151
implementation("org.bouncycastle:bcpg-jdk14:1.70")
152152
implementation("org.bouncycastle:bcpg-jdk15+:1.46")
@@ -155,6 +155,7 @@ dependencies {
155155
implementation("org.bouncycastle:bcpg-jdk15to18:1.70")
156156
implementation("org.bouncycastle:bcpg-jdk16:1.46")
157157
implementation("org.bouncycastle:bcpg-jdk18on:1.72")
158+
implementation("org.bouncycastle:bcpkix-fips:1.0.7")
158159
implementation("org.bouncycastle:bcpkix-jdk14:1.70")
159160
implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
160161
implementation("org.bouncycastle:bcpkix-jdk15to18:1.70")
@@ -196,7 +197,7 @@ dependencies {
196197
implementation("org.bouncycastle:bcutil-jdk15to18:1.70")
197198
implementation("org.bouncycastle:bcutil-jdk18on:1.72")
198199
implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1")
199-
implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1")
200+
implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.0")
200201
implementation("org.codehaus.woodstox:wstx-asl:4.0.6")
201202
implementation("org.codehaus.woodstox:wstx-lgpl:3.2.9")
202203
implementation("org.dom4j:dom4j:2.1.3")
@@ -216,7 +217,7 @@ dependencies {
216217
implementation("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final")
217218
implementation("org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2")
218219
implementation("org.javassist:javassist:3.29.1-GA")
219-
implementation("org.jboss.resteasy:jaxrs-api:3.0.1.Final")
220+
implementation("org.jboss.resteasy:jaxrs-api:2.0.0.GA")
220221
implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final")
221222
implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final")
222223
implementation("org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final")
@@ -249,12 +250,7 @@ dependencies {
249250
implementation("velocity:velocity:1.4")
250251
implementation("woodstox:wstx-asl:2.9.3")
251252

252-
implementation("com.google.collections:google-collections:1.0")
253-
implementation("com.sun.activation:jakarta.activation:2.0.1")
254-
implementation("org.bouncycastle:bc-fips-debug:1.0.2.3")
255-
implementation("org.bouncycastle:bc-fips:1.0.2.3")
256-
implementation("org.bouncycastle:bcpg-fips:1.0.6")
257-
implementation("org.bouncycastle:bcpkix-fips:1.0.7")
253+
implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326
258254

259255
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
260256
}

‎samples/sample-all-deactivated/build.out‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ compileClasspath - Compile classpath for source set 'main'.
2323
+--- com.miglayout:miglayout-swing:5.0 FAILED
2424
+--- com.miglayout:miglayout:3.7.4 FAILED
2525
+--- com.mysql:mysql-connector-j:8.3.0 FAILED
26+
+--- com.sun.activation:jakarta.activation:2.0.1 FAILED
2627
+--- com.sun.activation:javax.activation:1.2.0 FAILED
2728
+--- com.sun.mail:jakarta.mail:2.0.1 FAILED
2829
+--- com.sun.mail:javax.mail:1.6.2 FAILED
@@ -35,12 +36,11 @@ compileClasspath - Compile classpath for source set 'main'.
3536
+--- com.zaxxer:HikariCP:5.0.1 FAILED
3637
+--- commons-beanutils:commons-beanutils-core:1.8.3 FAILED
3738
+--- commons-beanutils:commons-beanutils:1.9.4 FAILED
38-
+--- commons-collections:commons-collections:3.2.2
3939
+--- commons-io:commons-io:2.11.0 FAILED
4040
+--- commons-logging:commons-logging:1.3.0 FAILED
4141
+--- dom4j:dom4j:1.6.1 FAILED
42-
+--- jakarta.activation:jakarta.activation-api:2.1.0 FAILED
43-
+--- jakarta.annotation:jakarta.annotation-api:1.3.5 FAILED
42+
+--- jakarta.activation:jakarta.activation-api:2.0.0 FAILED
43+
+--- jakarta.annotation:jakarta.annotation-api:2.1.1 FAILED
4444
+--- jakarta.ejb:jakarta.ejb-api:3.2.6 FAILED
4545
+--- jakarta.el:jakarta.el-api:3.0.3 FAILED
4646
+--- jakarta.inject:jakarta.inject-api:1.0.5 FAILED
@@ -50,12 +50,11 @@ compileClasspath - Compile classpath for source set 'main'.
5050
+--- jakarta.persistence:jakarta.persistence-api:2.2.3 FAILED
5151
+--- jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7 FAILED
5252
+--- jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6 FAILED
53-
+--- jakarta.servlet:jakarta.servlet-api:4.0.4 FAILED
53+
+--- jakarta.servlet:jakarta.servlet-api:5.0.0 FAILED
5454
+--- jakarta.transaction:jakarta.transaction-api:2.0.1
5555
+--- jakarta.validation:jakarta.validation-api:2.0.1 FAILED
56-
+--- jakarta.websocket:jakarta.websocket-api:2.1.0 FAILED
57-
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.0 FAILED
58-
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.0.0 FAILED
56+
+--- jakarta.websocket:jakarta.websocket-client-api:2.1.1 FAILED
57+
+--- jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 FAILED
5958
+--- jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 FAILED
6059
+--- jakarta.xml.soap:jakarta.xml.soap-api:1.4.2 FAILED
6160
+--- jakarta.xml.ws:jakarta.xml.ws-api:2.3.3 FAILED
@@ -87,12 +86,12 @@ compileClasspath - Compile classpath for source set 'main'.
8786
+--- javax.transaction:jta:1.1 FAILED
8887
+--- javax.validation:validation-api:2.0.1.Final FAILED
8988
+--- javax.websocket:javax.websocket-api:1.1 FAILED
90-
+--- javax.websocket:javax.websocket-client-api:1.1 FAILED
89+
+--- javax.websocket:javax.websocket-client-api:1.0 FAILED
9190
+--- javax.ws.rs:javax.ws.rs-api:2.1.1 FAILED
9291
+--- javax.ws.rs:jsr311-api:1.1.1 FAILED
9392
+--- javax.xml.bind:jaxb-api:2.3.1 FAILED
9493
+--- javax.xml.soap:javax.xml.soap-api:1.4.0 FAILED
95-
+--- javax.xml.stream:stax-api:1.0-2 FAILED
94+
+--- javax.xml.stream:stax-api:1.0 FAILED
9695
+--- javax.xml.ws:jaxws-api:2.3.1 FAILED
9796
+--- jboss:javassist:3.8.0.GA FAILED
9897
+--- junit:junit-dep:4.8 FAILED
@@ -122,16 +121,18 @@ compileClasspath - Compile classpath for source set 'main'.
122121
+--- org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0 FAILED
123122
+--- org.apache.logging.log4j:log4j-to-slf4j:2.23.0 FAILED
124123
+--- org.apache.solr:solr-commons-csv:3.5.0 FAILED
125-
+--- org.apache.tomcat.embed:tomcat-embed-core:9.0.1 FAILED
126-
+--- org.apache.tomcat.embed:tomcat-embed-websocket:9.0.1 FAILED
124+
+--- org.apache.tomcat.embed:tomcat-embed-core:10.1.0 FAILED
125+
+--- org.apache.tomcat.embed:tomcat-embed-websocket:10.1.0 FAILED
127126
+--- org.apache.tomcat:servlet-api:6.0.53 FAILED
128-
+--- org.apache.tomcat:tomcat-annotations-api:9.0.1 FAILED
129-
+--- org.apache.tomcat:tomcat-servlet-api:9.0.1 FAILED
127+
+--- org.apache.tomcat:tomcat-annotations-api:10.1.1 FAILED
128+
+--- org.apache.tomcat:tomcat-servlet-api:10.1.1 FAILED
130129
+--- org.apache.tomcat:tomcat-websocket-api:10.1.0 FAILED
131130
+--- org.apache.tomcat:tomcat-websocket-client-api:10.1.0 FAILED
132131
+--- org.apache.tomcat:tomcat-websocket:10.1.1 FAILED
133132
+--- org.apache.velocity:velocity-engine-core:2.3 FAILED
134133
+--- org.apache.velocity:velocity:1.7 FAILED
134+
+--- org.bouncycastle:bc-fips-debug:1.0.2.3 FAILED
135+
+--- org.bouncycastle:bc-fips:1.0.2.3 FAILED
135136
+--- org.bouncycastle:bcjmail-jdk15on:1.70 FAILED
136137
+--- org.bouncycastle:bcjmail-jdk15to18:1.70 FAILED
137138
+--- org.bouncycastle:bcjmail-jdk18on:1.72 FAILED
@@ -143,6 +144,7 @@ compileClasspath - Compile classpath for source set 'main'.
143144
+--- org.bouncycastle:bcmail-jdk15to18:1.70 FAILED
144145
+--- org.bouncycastle:bcmail-jdk16:1.46 FAILED
145146
+--- org.bouncycastle:bcmail-jdk18on:1.71 FAILED
147+
+--- org.bouncycastle:bcpg-fips:1.0.6 FAILED
146148
+--- org.bouncycastle:bcpg-jdk12:130 FAILED
147149
+--- org.bouncycastle:bcpg-jdk14:1.70 FAILED
148150
+--- org.bouncycastle:bcpg-jdk15+:1.46 FAILED
@@ -151,6 +153,7 @@ compileClasspath - Compile classpath for source set 'main'.
151153
+--- org.bouncycastle:bcpg-jdk15to18:1.70 FAILED
152154
+--- org.bouncycastle:bcpg-jdk16:1.46 FAILED
153155
+--- org.bouncycastle:bcpg-jdk18on:1.72 FAILED
156+
+--- org.bouncycastle:bcpkix-fips:1.0.7 FAILED
154157
+--- org.bouncycastle:bcpkix-jdk14:1.70 FAILED
155158
+--- org.bouncycastle:bcpkix-jdk15on:1.70 FAILED
156159
+--- org.bouncycastle:bcpkix-jdk15to18:1.70 FAILED
@@ -192,7 +195,7 @@ compileClasspath - Compile classpath for source set 'main'.
192195
+--- org.bouncycastle:bcutil-jdk15to18:1.70 FAILED
193196
+--- org.bouncycastle:bcutil-jdk18on:1.72 FAILED
194197
+--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 FAILED
195-
+--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.1 FAILED
198+
+--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.0 FAILED
196199
+--- org.codehaus.woodstox:wstx-asl:4.0.6 FAILED
197200
+--- org.codehaus.woodstox:wstx-lgpl:3.2.9 FAILED
198201
+--- org.dom4j:dom4j:2.1.3 FAILED
@@ -212,7 +215,7 @@ compileClasspath - Compile classpath for source set 'main'.
212215
+--- org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final FAILED
213216
+--- org.hibernate.javax.persistence:hibernate-jpa-2.2-api:1.0.0.Beta2 FAILED
214217
+--- org.javassist:javassist:3.29.1-GA FAILED
215-
+--- org.jboss.resteasy:jaxrs-api:3.0.1.Final FAILED
218+
+--- org.jboss.resteasy:jaxrs-api:2.0.0.GA FAILED
216219
+--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final FAILED
217220
+--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final FAILED
218221
+--- org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec:2.0.0.Final FAILED
@@ -244,11 +247,6 @@ compileClasspath - Compile classpath for source set 'main'.
244247
+--- stax:stax-api:1.0.1 FAILED
245248
+--- velocity:velocity:1.4 FAILED
246249
+--- woodstox:wstx-asl:2.9.3 FAILED
247-
+--- com.google.collections:google-collections:1.0 FAILED
248-
+--- com.sun.activation:jakarta.activation:2.0.1 FAILED
249-
+--- org.bouncycastle:bc-fips-debug:1.0.2.3 FAILED
250-
+--- org.bouncycastle:bc-fips:1.0.2.3 FAILED
251-
+--- org.bouncycastle:bcpg-fips:1.0.6 FAILED
252-
\--- org.bouncycastle:bcpkix-fips:1.0.7 FAILED
250+
\--- com.google.collections:google-collections:1.0 FAILED
253251

254252
A web-based, searchable dependency report is available by adding the --scan option.

‎samples/sample-all-deactivated/build.sample.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
executable: gradlew
2+
args: -s
23
expected-output-file: build.out

‎samples/sample-all/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ dependencies {
252252
implementation("stax:stax-api:1.0.1")
253253
implementation("velocity:velocity:1.4")
254254
implementation("woodstox:wstx-asl:2.9.3")
255-
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
256255

257-
// Declaration moved down here due to bug: https://github.com/gradle/gradle/issues/22326
258-
implementation("com.google.collections:google-collections:1.0")
256+
implementation("com.google.collections:google-collections:1.0") // moved down: https://github.com/gradle/gradle/issues/22326
257+
258+
// implementation("woodstox:wstx-lgpl:3.2.7") - has no POM file
259259
}
260260

261261
jvmDependencyConflicts {

0 commit comments

Comments
 (0)