Skip to content

Commit 0ac04f7

Browse files
mwcwmwcw
committed
Ongoing work on modernising build.
(mail and jmail left out for now)
1 parent ca2d233 commit 0ac04f7

File tree

10 files changed

+37
-725
lines changed

10 files changed

+37
-725
lines changed

Diff for: ‎core/build.gradle

-76
Original file line numberDiff line numberDiff line change
@@ -13,79 +13,3 @@ test {
1313
forkEvery = 1;
1414
maxParallelForks = 8;
1515
}
16-
17-
18-
task test11(type:Test) {
19-
forkEvery = 1;
20-
maxParallelForks = 1;
21-
22-
systemProperty 'bc.test.data.home', bcTestDataHome
23-
maxHeapSize = "1536m"
24-
testLogging.showStandardStreams = true
25-
26-
javaLauncher = javaToolchains.launcherFor {
27-
languageVersion = JavaLanguageVersion.of(11)
28-
}
29-
30-
jvmArgs=['-Dtest.java.version.prefix=11.']
31-
32-
33-
finalizedBy jacocoTestReport
34-
35-
filter {
36-
includeTestsMatching "AllTest*"
37-
if (project.hasProperty('excludeTests')) {
38-
excludeTestsMatching "${excludeTests}"
39-
}
40-
}
41-
}
42-
43-
task test17(type:Test) {
44-
forkEvery = 1;
45-
maxParallelForks = 1;
46-
47-
systemProperty 'bc.test.data.home', bcTestDataHome
48-
maxHeapSize = "1536m"
49-
testLogging.showStandardStreams = true
50-
51-
javaLauncher = javaToolchains.launcherFor {
52-
languageVersion = JavaLanguageVersion.of(17)
53-
}
54-
55-
jvmArgs=['-Dtest.java.version.prefix=17.']
56-
57-
58-
finalizedBy jacocoTestReport
59-
60-
filter {
61-
includeTestsMatching "AllTest*"
62-
if (project.hasProperty('excludeTests')) {
63-
excludeTestsMatching "${excludeTests}"
64-
}
65-
}
66-
}
67-
68-
task test21(type:Test) {
69-
forkEvery = 1;
70-
maxParallelForks = 1;
71-
72-
systemProperty 'bc.test.data.home', bcTestDataHome
73-
maxHeapSize = "1536m"
74-
testLogging.showStandardStreams = true
75-
76-
javaLauncher = javaToolchains.launcherFor {
77-
languageVersion = JavaLanguageVersion.of(21)
78-
}
79-
80-
jvmArgs=['-Dtest.java.version.prefix=21']
81-
82-
83-
finalizedBy jacocoTestReport
84-
85-
filter {
86-
includeTestsMatching "AllTest*"
87-
if (project.hasProperty('excludeTests')) {
88-
excludeTestsMatching "${excludeTests}"
89-
}
90-
}
91-
}

Diff for: ‎jmail/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ sourceSets {
1919
}
2020

2121
dependencies {
22-
implementation project(':prov')
23-
implementation project(':util')
22+
// implementation project(':prov')
23+
// implementation project(':util')
2424
implementation project(':pkix')
2525

2626
implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.0.1'
2727
implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.0.0'
28-
implementation files("$bc_prov")
29-
implementation files("$bc_util")
30-
implementation files("$bc_pkix")
31-
implementation project(path: ':core')
28+
// implementation files("$bc_prov")
29+
// implementation files("$bc_util")
30+
// implementation files("$bc_pkix")
31+
// implementation project(path: ':core')
3232

3333
java9Implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.0.1'
3434
java9Implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.0.0'
35-
java9Implementation files("$bc_prov")
36-
java9Implementation files("$bc_util")
37-
java9Implementation files("$bc_pkix")
35+
// java9Implementation files("$bc_prov")
36+
// java9Implementation files("$bc_util")
37+
// java9Implementation files("$bc_pkix")
3838
java9Implementation files(sourceSets.main.output.classesDirs) {
3939
builtBy compileJava
4040
}

Diff for: ‎mail/build.gradle

+10-123
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,28 @@ sourceSets {
88
}
99
}
1010

11-
test11 {
12-
java {
13-
compileClasspath += main.output + test.output
14-
runtimeClasspath += test.output
15-
srcDir(files("src/test/java"))
16-
}
17-
}
11+
1812
}
1913

2014
dependencies {
21-
implementation project(':prov')
22-
implementation project(':util')
15+
// implementation project(':prov')
16+
// implementation project(':util')
2317
implementation project(':pkix')
2418

2519
implementation group: 'javax.mail', name: 'mail', version: '1.4'
26-
implementation files("$bc_prov")
27-
implementation files("$bc_util")
28-
implementation files("$bc_pkix")
29-
implementation project(path: ':core')
20+
// implementation files("$bc_prov")
21+
// implementation files("$bc_util")
22+
// implementation files("$bc_pkix")
23+
// implementation project(path: ':core')
3024

3125
java9Implementation group: 'javax.mail', name: 'mail', version: '1.4'
32-
java9Implementation files("$bc_prov")
33-
java9Implementation files("$bc_util")
34-
java9Implementation files("$bc_pkix")
26+
// java9Implementation files("$bc_prov")
27+
// java9Implementation files("$bc_util")
28+
// java9Implementation files("$bc_pkix")
3529
java9Implementation files(sourceSets.main.output.classesDirs) {
3630
builtBy compileJava
3731
}
3832

39-
test11Implementation group: 'javax.mail', name: 'mail', version: '1.4'
40-
test11Implementation group: 'junit', name: 'junit', version: '4.13.2'
41-
test11Implementation(project(":core"))
42-
test11Implementation files("$bc_prov")
43-
test11Implementation files("$bc_util")
44-
test11Implementation files("$bc_pkix")
4533

4634
}
4735

@@ -104,105 +92,4 @@ artifacts {
10492
test {
10593
forkEvery = 1;
10694
maxParallelForks = 8;
107-
}
108-
109-
110-
111-
112-
task test11(type: Test) {
113-
114-
dependsOn(jar)
115-
116-
testClassesDirs = sourceSets.test11.output.classesDirs
117-
classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
118-
119-
forkEvery = 1;
120-
maxParallelForks = 8;
121-
122-
systemProperty 'bc.test.data.home', bcTestDataHome
123-
maxHeapSize = "1536m"
124-
testLogging.showStandardStreams = true
125-
126-
javaLauncher = javaToolchains.launcherFor {
127-
languageVersion = JavaLanguageVersion.of(11)
128-
}
129-
130-
jvmArgs = ['-Dtest.java.version.prefix=11.']
131-
132-
133-
finalizedBy jacocoTestReport
134-
135-
filter {
136-
includeTestsMatching "AllTest*"
137-
includeTestsMatching "All11Test*"
138-
if (project.hasProperty('excludeTests')) {
139-
excludeTestsMatching "${excludeTests}"
140-
}
141-
}
142-
}
143-
144-
145-
task test17(type: Test) {
146-
147-
dependsOn(jar)
148-
149-
testClassesDirs = sourceSets.test11.output.classesDirs
150-
classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
151-
152-
forkEvery = 1;
153-
maxParallelForks = 8;
154-
155-
systemProperty 'bc.test.data.home', bcTestDataHome
156-
maxHeapSize = "1536m"
157-
testLogging.showStandardStreams = true
158-
159-
javaLauncher = javaToolchains.launcherFor {
160-
languageVersion = JavaLanguageVersion.of(17)
161-
}
162-
163-
jvmArgs = ['-Dtest.java.version.prefix=17.']
164-
165-
166-
finalizedBy jacocoTestReport
167-
168-
filter {
169-
includeTestsMatching "AllTest*"
170-
includeTestsMatching "All11Test*"
171-
if (project.hasProperty('excludeTests')) {
172-
excludeTestsMatching "${excludeTests}"
173-
}
174-
}
175-
}
176-
177-
178-
task test21(type: Test) {
179-
180-
dependsOn(jar)
181-
182-
testClassesDirs = sourceSets.test11.output.classesDirs
183-
classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
184-
185-
forkEvery = 1;
186-
maxParallelForks = 8;
187-
188-
systemProperty 'bc.test.data.home', bcTestDataHome
189-
maxHeapSize = "1536m"
190-
testLogging.showStandardStreams = true
191-
192-
javaLauncher = javaToolchains.launcherFor {
193-
languageVersion = JavaLanguageVersion.of(21)
194-
}
195-
196-
jvmArgs = ['-Dtest.java.version.prefix=21']
197-
198-
199-
finalizedBy jacocoTestReport
200-
201-
filter {
202-
includeTestsMatching "AllTest*"
203-
includeTestsMatching "All11Test*"
204-
if (project.hasProperty('excludeTests')) {
205-
excludeTestsMatching "${excludeTests}"
206-
}
207-
}
20895
}

Diff for: ‎mls/build.gradle

-74
Original file line numberDiff line numberDiff line change
@@ -116,77 +116,3 @@ extractIncludeTestProto {
116116

117117
createStartScripts('org.bouncycastle.mls.client.impl.MLSClient')
118118

119-
task test11(type: Test) {
120-
forkEvery = 1;
121-
maxParallelForks = 1;
122-
123-
systemProperty 'bc.test.data.home', bcTestDataHome
124-
maxHeapSize = "1536m"
125-
testLogging.showStandardStreams = true
126-
127-
javaLauncher = javaToolchains.launcherFor {
128-
languageVersion = JavaLanguageVersion.of(11)
129-
}
130-
131-
jvmArgs = ['-Dtest.java.version.prefix=11.']
132-
133-
134-
finalizedBy jacocoTestReport
135-
136-
filter {
137-
includeTestsMatching "AllTest*"
138-
if (project.hasProperty('excludeTests')) {
139-
excludeTestsMatching "${excludeTests}"
140-
}
141-
}
142-
}
143-
144-
145-
task test17(type: Test) {
146-
forkEvery = 1;
147-
maxParallelForks = 1;
148-
149-
systemProperty 'bc.test.data.home', bcTestDataHome
150-
maxHeapSize = "1536m"
151-
testLogging.showStandardStreams = true
152-
153-
javaLauncher = javaToolchains.launcherFor {
154-
languageVersion = JavaLanguageVersion.of(17)
155-
}
156-
157-
jvmArgs = ['-Dtest.java.version.prefix=17.']
158-
159-
160-
finalizedBy jacocoTestReport
161-
162-
filter {
163-
includeTestsMatching "AllTest*"
164-
if (project.hasProperty('excludeTests')) {
165-
excludeTestsMatching "${excludeTests}"
166-
}
167-
}
168-
}
169-
170-
task test21(type: Test) {
171-
forkEvery = 1;
172-
maxParallelForks = 1;
173-
174-
systemProperty 'bc.test.data.home', bcTestDataHome
175-
maxHeapSize = "1536m"
176-
testLogging.showStandardStreams = true
177-
178-
javaLauncher = javaToolchains.launcherFor {
179-
languageVersion = JavaLanguageVersion.of(21)
180-
}
181-
182-
jvmArgs = ['-Dtest.java.version.prefix=21']
183-
184-
finalizedBy jacocoTestReport
185-
186-
filter {
187-
includeTestsMatching "AllTest*"
188-
if (project.hasProperty('excludeTests')) {
189-
excludeTestsMatching "${excludeTests}"
190-
}
191-
}
192-
}

0 commit comments

Comments
 (0)