Skip to content

Commit 134992a

Browse files
jjohannesjjohannes
committed
Extend bouncycastle rules to contain LTS versions
1 parent 6185422 commit 134992a

File tree

5 files changed

+115
-79
lines changed

5 files changed

+115
-79
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ dependencies {
101101
implementation("junit:junit:4.13.2")
102102
implementation("log4j:log4j:1.2.17")
103103
implementation("mysql:mysql-connector-java:8.0.33")
104-
implementation("net.java.dev.jna:jna:5.17.0")
105104
implementation("net.java.dev.jna:jna-platform:5.17.0")
105+
implementation("net.java.dev.jna:jna:5.17.0")
106106
implementation("net.java.dev.jna:platform:3.5.2")
107107
implementation("net.jcip:jcip-annotations:1.0")
108108
implementation("net.jpountz.lz4:lz4:1.3")
@@ -139,6 +139,7 @@ dependencies {
139139
implementation("org.bouncycastle:bcjmail-jdk15on:1.70")
140140
implementation("org.bouncycastle:bcjmail-jdk15to18:1.80")
141141
implementation("org.bouncycastle:bcjmail-jdk18on:1.80")
142+
implementation("org.bouncycastle:bcjmail-lts8on:2.73.7")
142143
implementation("org.bouncycastle:bcmail-fips:2.1.6")
143144
implementation("org.bouncycastle:bcmail-jdk14:1.80")
144145
implementation("org.bouncycastle:bcmail-jdk15+:1.46")
@@ -147,6 +148,7 @@ dependencies {
147148
implementation("org.bouncycastle:bcmail-jdk15to18:1.80")
148149
implementation("org.bouncycastle:bcmail-jdk16:1.46")
149150
implementation("org.bouncycastle:bcmail-jdk18on:1.80")
151+
implementation("org.bouncycastle:bcmail-lts8on:2.73.7")
150152
implementation("org.bouncycastle:bcpg-fips:2.1.11")
151153
implementation("org.bouncycastle:bcpg-jdk12:130")
152154
implementation("org.bouncycastle:bcpg-jdk14:1.80")
@@ -156,11 +158,13 @@ dependencies {
156158
implementation("org.bouncycastle:bcpg-jdk15to18:1.80")
157159
implementation("org.bouncycastle:bcpg-jdk16:1.46")
158160
implementation("org.bouncycastle:bcpg-jdk18on:1.80")
161+
implementation("org.bouncycastle:bcpg-lts8on:2.73.7")
159162
implementation("org.bouncycastle:bcpkix-fips:2.1.9")
160163
implementation("org.bouncycastle:bcpkix-jdk14:1.80")
161164
implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
162165
implementation("org.bouncycastle:bcpkix-jdk15to18:1.80")
163166
implementation("org.bouncycastle:bcpkix-jdk18on:1.80")
167+
implementation("org.bouncycastle:bcpkix-lts8on:2.73.7")
164168
implementation("org.bouncycastle:bcprov-debug-jdk14:1.80")
165169
implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70")
166170
implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.79")
@@ -183,11 +187,13 @@ dependencies {
183187
implementation("org.bouncycastle:bcprov-jdk15to18:1.80")
184188
implementation("org.bouncycastle:bcprov-jdk16:1.46")
185189
implementation("org.bouncycastle:bcprov-jdk18on:1.80")
190+
implementation("org.bouncycastle:bcprov-lts8on:2.73.7")
186191
implementation("org.bouncycastle:bctls-fips:2.1.20")
187192
implementation("org.bouncycastle:bctls-jdk14:1.80")
188193
implementation("org.bouncycastle:bctls-jdk15on:1.70")
189194
implementation("org.bouncycastle:bctls-jdk15to18:1.80")
190195
implementation("org.bouncycastle:bctls-jdk18on:1.80")
196+
implementation("org.bouncycastle:bctls-lts8on:2.73.7")
191197
implementation("org.bouncycastle:bctsp-jdk14:1.46")
192198
implementation("org.bouncycastle:bctsp-jdk15+:1.46")
193199
implementation("org.bouncycastle:bctsp-jdk15:1.46")
@@ -197,6 +203,7 @@ dependencies {
197203
implementation("org.bouncycastle:bcutil-jdk15on:1.70")
198204
implementation("org.bouncycastle:bcutil-jdk15to18:1.80")
199205
implementation("org.bouncycastle:bcutil-jdk18on:1.80")
206+
implementation("org.bouncycastle:bcutil-lts8on:2.73.7")
200207
implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1")
201208
implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1")
202209
implementation("org.codehaus.woodstox:wstx-asl:4.0.6")

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ compileClasspath - Compile classpath for source set 'main'.
109109
+--- junit:junit:4.13.2 FAILED
110110
+--- log4j:log4j:1.2.17 FAILED
111111
+--- mysql:mysql-connector-java:8.0.33 FAILED
112-
+--- net.java.dev.jna:jna:5.17.0 FAILED
113112
+--- net.java.dev.jna:jna-platform:5.17.0 FAILED
113+
+--- net.java.dev.jna:jna:5.17.0 FAILED
114114
+--- net.java.dev.jna:platform:3.5.2 FAILED
115115
+--- net.jcip:jcip-annotations:1.0 FAILED
116116
+--- net.jpountz.lz4:lz4:1.3 FAILED
@@ -147,6 +147,7 @@ compileClasspath - Compile classpath for source set 'main'.
147147
+--- org.bouncycastle:bcjmail-jdk15on:1.70 FAILED
148148
+--- org.bouncycastle:bcjmail-jdk15to18:1.80 FAILED
149149
+--- org.bouncycastle:bcjmail-jdk18on:1.80 FAILED
150+
+--- org.bouncycastle:bcjmail-lts8on:2.73.7 FAILED
150151
+--- org.bouncycastle:bcmail-fips:2.1.6 FAILED
151152
+--- org.bouncycastle:bcmail-jdk14:1.80 FAILED
152153
+--- org.bouncycastle:bcmail-jdk15+:1.46 FAILED
@@ -155,6 +156,7 @@ compileClasspath - Compile classpath for source set 'main'.
155156
+--- org.bouncycastle:bcmail-jdk15to18:1.80 FAILED
156157
+--- org.bouncycastle:bcmail-jdk16:1.46 FAILED
157158
+--- org.bouncycastle:bcmail-jdk18on:1.80 FAILED
159+
+--- org.bouncycastle:bcmail-lts8on:2.73.7 FAILED
158160
+--- org.bouncycastle:bcpg-fips:2.1.11 FAILED
159161
+--- org.bouncycastle:bcpg-jdk12:130 FAILED
160162
+--- org.bouncycastle:bcpg-jdk14:1.80 FAILED
@@ -164,11 +166,13 @@ compileClasspath - Compile classpath for source set 'main'.
164166
+--- org.bouncycastle:bcpg-jdk15to18:1.80 FAILED
165167
+--- org.bouncycastle:bcpg-jdk16:1.46 FAILED
166168
+--- org.bouncycastle:bcpg-jdk18on:1.80 FAILED
169+
+--- org.bouncycastle:bcpg-lts8on:2.73.7 FAILED
167170
+--- org.bouncycastle:bcpkix-fips:2.1.9 FAILED
168171
+--- org.bouncycastle:bcpkix-jdk14:1.80 FAILED
169172
+--- org.bouncycastle:bcpkix-jdk15on:1.70 FAILED
170173
+--- org.bouncycastle:bcpkix-jdk15to18:1.80 FAILED
171174
+--- org.bouncycastle:bcpkix-jdk18on:1.80 FAILED
175+
+--- org.bouncycastle:bcpkix-lts8on:2.73.7 FAILED
172176
+--- org.bouncycastle:bcprov-debug-jdk14:1.80 FAILED
173177
+--- org.bouncycastle:bcprov-debug-jdk15on:1.70 FAILED
174178
+--- org.bouncycastle:bcprov-debug-jdk15to18:1.79 FAILED
@@ -191,11 +195,13 @@ compileClasspath - Compile classpath for source set 'main'.
191195
+--- org.bouncycastle:bcprov-jdk15to18:1.80 FAILED
192196
+--- org.bouncycastle:bcprov-jdk16:1.46 FAILED
193197
+--- org.bouncycastle:bcprov-jdk18on:1.80 FAILED
198+
+--- org.bouncycastle:bcprov-lts8on:2.73.7 FAILED
194199
+--- org.bouncycastle:bctls-fips:2.1.20 FAILED
195200
+--- org.bouncycastle:bctls-jdk14:1.80 FAILED
196201
+--- org.bouncycastle:bctls-jdk15on:1.70 FAILED
197202
+--- org.bouncycastle:bctls-jdk15to18:1.80 FAILED
198203
+--- org.bouncycastle:bctls-jdk18on:1.80 FAILED
204+
+--- org.bouncycastle:bctls-lts8on:2.73.7 FAILED
199205
+--- org.bouncycastle:bctsp-jdk14:1.46 FAILED
200206
+--- org.bouncycastle:bctsp-jdk15+:1.46 FAILED
201207
+--- org.bouncycastle:bctsp-jdk15:1.46 FAILED
@@ -205,6 +211,7 @@ compileClasspath - Compile classpath for source set 'main'.
205211
+--- org.bouncycastle:bcutil-jdk15on:1.70 FAILED
206212
+--- org.bouncycastle:bcutil-jdk15to18:1.80 FAILED
207213
+--- org.bouncycastle:bcutil-jdk18on:1.80 FAILED
214+
+--- org.bouncycastle:bcutil-lts8on:2.73.7 FAILED
208215
+--- org.codehaus.woodstox:woodstox-core-asl:4.4.1 FAILED
209216
+--- org.codehaus.woodstox:woodstox-core-lgpl:4.4.1 FAILED
210217
+--- org.codehaus.woodstox:wstx-asl:4.0.6 FAILED

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ dependencies {
104104
implementation("junit:junit:4.13.2")
105105
implementation("log4j:log4j:1.2.17")
106106
implementation("mysql:mysql-connector-java:8.0.33")
107-
implementation("net.java.dev.jna:jna:5.17.0")
108107
implementation("net.java.dev.jna:jna-platform:5.17.0")
108+
implementation("net.java.dev.jna:jna:5.17.0")
109109
implementation("net.java.dev.jna:platform:3.5.2")
110110
implementation("net.jcip:jcip-annotations:1.0")
111111
implementation("net.jpountz.lz4:lz4:1.3")
@@ -142,6 +142,7 @@ dependencies {
142142
implementation("org.bouncycastle:bcjmail-jdk15on:1.70")
143143
implementation("org.bouncycastle:bcjmail-jdk15to18:1.80")
144144
implementation("org.bouncycastle:bcjmail-jdk18on:1.80")
145+
implementation("org.bouncycastle:bcjmail-lts8on:2.73.7")
145146
implementation("org.bouncycastle:bcmail-fips:2.1.6")
146147
implementation("org.bouncycastle:bcmail-jdk14:1.80")
147148
implementation("org.bouncycastle:bcmail-jdk15+:1.46")
@@ -150,6 +151,7 @@ dependencies {
150151
implementation("org.bouncycastle:bcmail-jdk15to18:1.80")
151152
implementation("org.bouncycastle:bcmail-jdk16:1.46")
152153
implementation("org.bouncycastle:bcmail-jdk18on:1.80")
154+
implementation("org.bouncycastle:bcmail-lts8on:2.73.7")
153155
implementation("org.bouncycastle:bcpg-fips:2.1.11")
154156
implementation("org.bouncycastle:bcpg-jdk12:130")
155157
implementation("org.bouncycastle:bcpg-jdk14:1.80")
@@ -159,11 +161,13 @@ dependencies {
159161
implementation("org.bouncycastle:bcpg-jdk15to18:1.80")
160162
implementation("org.bouncycastle:bcpg-jdk16:1.46")
161163
implementation("org.bouncycastle:bcpg-jdk18on:1.80")
164+
implementation("org.bouncycastle:bcpg-lts8on:2.73.7")
162165
implementation("org.bouncycastle:bcpkix-fips:2.1.9")
163166
implementation("org.bouncycastle:bcpkix-jdk14:1.80")
164167
implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
165168
implementation("org.bouncycastle:bcpkix-jdk15to18:1.80")
166169
implementation("org.bouncycastle:bcpkix-jdk18on:1.80")
170+
implementation("org.bouncycastle:bcpkix-lts8on:2.73.7")
167171
implementation("org.bouncycastle:bcprov-debug-jdk14:1.80")
168172
implementation("org.bouncycastle:bcprov-debug-jdk15on:1.70")
169173
implementation("org.bouncycastle:bcprov-debug-jdk15to18:1.79")
@@ -186,11 +190,13 @@ dependencies {
186190
implementation("org.bouncycastle:bcprov-jdk15to18:1.80")
187191
implementation("org.bouncycastle:bcprov-jdk16:1.46")
188192
implementation("org.bouncycastle:bcprov-jdk18on:1.80")
193+
implementation("org.bouncycastle:bcprov-lts8on:2.73.7")
189194
implementation("org.bouncycastle:bctls-fips:2.1.20")
190195
implementation("org.bouncycastle:bctls-jdk14:1.80")
191196
implementation("org.bouncycastle:bctls-jdk15on:1.70")
192197
implementation("org.bouncycastle:bctls-jdk15to18:1.80")
193198
implementation("org.bouncycastle:bctls-jdk18on:1.80")
199+
implementation("org.bouncycastle:bctls-lts8on:2.73.7")
194200
implementation("org.bouncycastle:bctsp-jdk14:1.46")
195201
implementation("org.bouncycastle:bctsp-jdk15+:1.46")
196202
implementation("org.bouncycastle:bctsp-jdk15:1.46")
@@ -200,6 +206,7 @@ dependencies {
200206
implementation("org.bouncycastle:bcutil-jdk15on:1.70")
201207
implementation("org.bouncycastle:bcutil-jdk15to18:1.80")
202208
implementation("org.bouncycastle:bcutil-jdk18on:1.80")
209+
implementation("org.bouncycastle:bcutil-lts8on:2.73.7")
203210
implementation("org.codehaus.woodstox:woodstox-core-asl:4.4.1")
204211
implementation("org.codehaus.woodstox:woodstox-core-lgpl:4.4.1")
205212
implementation("org.codehaus.woodstox:wstx-asl:4.0.6")
@@ -264,13 +271,13 @@ jvmDependencyConflicts {
264271
enforceSlf4JSimple()
265272
}
266273
conflictResolution {
267-
select(CapabilityDefinition.BOUNCYCASTLE_BCMAIL, "org.bouncycastle:bcmail-jdk18on")
268-
select(CapabilityDefinition.BOUNCYCASTLE_BCPG, "org.bouncycastle:bcpg-jdk18on")
269-
select(CapabilityDefinition.BOUNCYCASTLE_BCPKIX, "org.bouncycastle:bcpkix-jdk18on")
270-
select(CapabilityDefinition.BOUNCYCASTLE_BCPROV, "org.bouncycastle:bcprov-jdk18on")
271-
select(CapabilityDefinition.BOUNCYCASTLE_BCTLS, "org.bouncycastle:bctls-jdk18on")
274+
select(CapabilityDefinition.BOUNCYCASTLE_BCMAIL, "org.bouncycastle:bcmail-lts8on")
275+
select(CapabilityDefinition.BOUNCYCASTLE_BCPG, "org.bouncycastle:bcpg-lts8on")
276+
select(CapabilityDefinition.BOUNCYCASTLE_BCPKIX, "org.bouncycastle:bcpkix-lts8on")
277+
select(CapabilityDefinition.BOUNCYCASTLE_BCPROV, "org.bouncycastle:bcprov-lts8on")
278+
select(CapabilityDefinition.BOUNCYCASTLE_BCTLS, "org.bouncycastle:bctls-lts8on")
272279
select(CapabilityDefinition.BOUNCYCASTLE_BCTSP, "org.bouncycastle:bctsp-jdk15on")
273-
select(CapabilityDefinition.BOUNCYCASTLE_BCUTIL, "org.bouncycastle:bcutil-jdk18on")
280+
select(CapabilityDefinition.BOUNCYCASTLE_BCUTIL, "org.bouncycastle:bcutil-lts8on")
274281
select(CapabilityDefinition.CGLIB, "cglib:cglib")
275282
select(CapabilityDefinition.JAKARTA_SERVLET_API, "jakarta.servlet:jakarta.servlet-api")
276283
select(CapabilityDefinition.JAVAX_ACTIVATION_API, "javax.activation:javax.activation-api")

0 commit comments

Comments
 (0)