File tree 3 files changed +26
-28
lines changed 3 files changed +26
-28
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ pipeline {
18
18
}
19
19
20
20
stages {
21
- stage(" test: baseline (Java 17 )" ) {
21
+ stage(" test: baseline (main )" ) {
22
22
when {
23
23
beforeAgent(true )
24
24
anyOf {
@@ -35,7 +35,7 @@ pipeline {
35
35
}
36
36
steps {
37
37
script {
38
- docker. image(p[' docker.java.main .image' ]). inside(p[' docker.java.inside.docker' ]) {
38
+ docker. image(p[' docker.java.next .image' ]). inside(p[' docker.java.inside.docker' ]) { // TODO: Switch back to `main`
39
39
sh ' PROFILE=all-dbs ci/test.sh'
40
40
sh " ci/clean.sh"
41
41
}
@@ -53,6 +53,23 @@ pipeline {
53
53
}
54
54
55
55
parallel {
56
+ stage(" test: baseline (next)" ) {
57
+ agent {
58
+ label ' data'
59
+ }
60
+ options { timeout(time : 30 , unit : ' MINUTES' )}
61
+ environment {
62
+ ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
63
+ }
64
+ steps {
65
+ script {
66
+ docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
67
+ sh ' PROFILE=all-dbs ci/test.sh'
68
+ sh " ci/clean.sh"
69
+ }
70
+ }
71
+ }
72
+ }
56
73
stage(" test: eclipselink-next" ) {
57
74
agent {
58
75
label ' data'
Original file line number Diff line number Diff line change 181
181
</excludes >
182
182
<argLine >
183
183
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
184
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
185
184
</argLine >
186
185
</configuration >
187
186
</execution >
196
195
<include >**/EclipseLink*Tests.java</include >
197
196
</includes >
198
197
<argLine >
199
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
200
198
-javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
201
199
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
202
200
</argLine >
Original file line number Diff line number Diff line change 155
155
<artifactId >hibernate-core</artifactId >
156
156
<version >${hibernate} </version >
157
157
<optional >true</optional >
158
+ <exclusions >
159
+ <exclusion >
160
+ <groupId >net.bytebuddy</groupId >
161
+ <artifactId >byte-buddy</artifactId >
162
+ </exclusion >
163
+ </exclusions >
158
164
</dependency >
159
-
165
+
160
166
<dependency >
161
167
<groupId >${hibernate.groupId} .orm</groupId >
162
168
<artifactId >hibernate-jpamodelgen</artifactId >
252
258
<build >
253
259
<plugins >
254
260
255
- <!--
256
- Jacoco plugin redeclared to make sure it's downloaded and
257
- the agents can be explicitly added to the test executions.
258
- -->
259
- <plugin >
260
- <groupId >org.jacoco</groupId >
261
- <artifactId >jacoco-maven-plugin</artifactId >
262
- <version >${jacoco} </version >
263
- <configuration >
264
- <destFile >${jacoco.destfile} </destFile >
265
- </configuration >
266
- <executions >
267
- <execution >
268
- <id >jacoco-initialize</id >
269
- <goals >
270
- <goal >prepare-agent</goal >
271
- </goals >
272
- </execution >
273
- </executions >
274
- </plugin >
275
-
276
261
<plugin >
277
262
<groupId >org.apache.maven.plugins</groupId >
278
263
<artifactId >maven-surefire-plugin</artifactId >
326
311
</excludes >
327
312
<argLine >
328
313
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
329
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
330
314
</argLine >
331
315
</configuration >
332
316
</execution >
341
325
<include >**/EclipseLink*Tests.java</include >
342
326
</includes >
343
327
<argLine >
344
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
345
328
-javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
346
329
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
347
330
</argLine >
You can’t perform that action at this time.
0 commit comments