File tree 3 files changed +25
-27
lines changed 3 files changed +25
-27
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 {
@@ -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 180
180
</excludes >
181
181
<argLine >
182
182
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
183
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
184
183
</argLine >
185
184
</configuration >
186
185
</execution >
195
194
<include >**/EclipseLink*Tests.java</include >
196
195
</includes >
197
196
<argLine >
198
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
199
197
-javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
200
198
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
201
199
</argLine >
Original file line number Diff line number Diff line change 149
149
<artifactId >hibernate-core</artifactId >
150
150
<version >${hibernate} </version >
151
151
<optional >true</optional >
152
+ <exclusions >
153
+ <exclusion >
154
+ <groupId >net.bytebuddy</groupId >
155
+ <artifactId >byte-buddy</artifactId >
156
+ </exclusion >
157
+ </exclusions >
152
158
</dependency >
153
-
159
+
154
160
<dependency >
155
161
<groupId >${hibernate.groupId} .orm</groupId >
156
162
<artifactId >hibernate-jpamodelgen</artifactId >
246
252
<build >
247
253
<plugins >
248
254
249
- <!--
250
- Jacoco plugin redeclared to make sure it's downloaded and
251
- the agents can be explicitly added to the test executions.
252
- -->
253
- <plugin >
254
- <groupId >org.jacoco</groupId >
255
- <artifactId >jacoco-maven-plugin</artifactId >
256
- <version >${jacoco} </version >
257
- <configuration >
258
- <destFile >${jacoco.destfile} </destFile >
259
- </configuration >
260
- <executions >
261
- <execution >
262
- <id >jacoco-initialize</id >
263
- <goals >
264
- <goal >prepare-agent</goal >
265
- </goals >
266
- </execution >
267
- </executions >
268
- </plugin >
269
-
270
255
<plugin >
271
256
<groupId >org.apache.maven.plugins</groupId >
272
257
<artifactId >maven-surefire-plugin</artifactId >
320
305
</excludes >
321
306
<argLine >
322
307
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
323
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
324
308
</argLine >
325
309
</configuration >
326
310
</execution >
335
319
<include >**/EclipseLink*Tests.java</include >
336
320
</includes >
337
321
<argLine >
338
- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
339
322
-javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
340
323
-javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
341
324
</argLine >
You can’t perform that action at this time.
0 commit comments