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 180180 </excludes >
181181 <argLine >
182182 -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}
184183 </argLine >
185184 </configuration >
186185 </execution >
195194 <include >**/EclipseLink*Tests.java</include >
196195 </includes >
197196 <argLine >
198- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
199197 -javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
200198 -javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
201199 </argLine >
Original file line number Diff line number Diff line change 149149 <artifactId >hibernate-core</artifactId >
150150 <version >${hibernate} </version >
151151 <optional >true</optional >
152+ <exclusions >
153+ <exclusion >
154+ <groupId >net.bytebuddy</groupId >
155+ <artifactId >byte-buddy</artifactId >
156+ </exclusion >
157+ </exclusions >
152158 </dependency >
153-
159+
154160 <dependency >
155161 <groupId >${hibernate.groupId} .orm</groupId >
156162 <artifactId >hibernate-jpamodelgen</artifactId >
246252 <build >
247253 <plugins >
248254
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-
270255 <plugin >
271256 <groupId >org.apache.maven.plugins</groupId >
272257 <artifactId >maven-surefire-plugin</artifactId >
320305 </excludes >
321306 <argLine >
322307 -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}
324308 </argLine >
325309 </configuration >
326310 </execution >
335319 <include >**/EclipseLink*Tests.java</include >
336320 </includes >
337321 <argLine >
338- -javaagent:${settings.localRepository} /org/jacoco/org.jacoco.agent/${jacoco} /org.jacoco.agent-${jacoco} -runtime.jar=destfile=${jacoco.destfile}
339322 -javaagent:${settings.localRepository} /org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink} /org.eclipse.persistence.jpa-${eclipselink} .jar
340323 -javaagent:${settings.localRepository} /org/springframework/spring-instrument/${spring} /spring-instrument-${spring} .jar
341324 </argLine >
You can’t perform that action at this time.
0 commit comments