File tree Expand file tree Collapse file tree 3 files changed +25
-27
lines changed
Expand file tree Collapse file tree 3 files changed +25
-27
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ pipeline {
1818 }
1919
2020 stages {
21- stage(" test: baseline (Java 17 )" ) {
21+ stage(" test: baseline (main )" ) {
2222 when {
2323 beforeAgent(true )
2424 anyOf {
@@ -53,6 +53,23 @@ pipeline {
5353 }
5454
5555 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+ }
5673 stage(" test: eclipselink-next" ) {
5774 agent {
5875 label ' data'
Original file line number Diff line number Diff line change 181181 </excludes >
182182 <argLine >
183183 -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}
185184 </argLine >
186185 </configuration >
187186 </execution >
196195 <include >**/EclipseLink*Tests.java</include >
197196 </includes >
198197 <argLine >
199- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
200198 -javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
201199 -javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
202200 </argLine >
Original file line number Diff line number Diff line change 155155 <artifactId >hibernate-core</artifactId >
156156 <version >${hibernate} </version >
157157 <optional >true</optional >
158+ <exclusions >
159+ <exclusion >
160+ <groupId >net.bytebuddy</groupId >
161+ <artifactId >byte-buddy</artifactId >
162+ </exclusion >
163+ </exclusions >
158164 </dependency >
159-
165+
160166 <dependency >
161167 <groupId >${hibernate.groupId} .orm</groupId >
162168 <artifactId >hibernate-jpamodelgen</artifactId >
252258 <build >
253259 <plugins >
254260
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-
276261 <plugin >
277262 <groupId >org.apache.maven.plugins</groupId >
278263 <artifactId >maven-surefire-plugin</artifactId >
326311 </excludes >
327312 <argLine >
328313 -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}
330314 </argLine >
331315 </configuration >
332316 </execution >
341325 <include >**/EclipseLink*Tests.java</include >
342326 </includes >
343327 <argLine >
344- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
345328 -javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
346329 -javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
347330 </argLine >
You can’t perform that action at this time.
0 commit comments