Skip to content

Commit 5bc47ac

Browse files
authored
Merge pull request #880 from hazendaz/master
Remove jacoco override (not needed) and rework of derby per jdk
2 parents 8741b17 + b5fcb5e commit 5bc47ac

File tree

1 file changed

+32
-4
lines changed

1 file changed

+32
-4
lines changed

pom.xml

+32-4
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<java.version>17</java.version>
110110
<java.release.version>17</java.release.version>
111111

112+
<derby.version>10.17.1.0</derby.version>
112113
<mybatis.version>3.5.14</mybatis.version>
113114
<spring.version>6.0.13</spring.version>
114115
<spring-batch.version>5.0.3</spring-batch.version>
@@ -119,9 +120,6 @@
119120
<!-- Reproducible Builds -->
120121
<project.build.outputTimestamp>1684514485</project.build.outputTimestamp>
121122

122-
<!-- TODO: Remove this after mybatis-parent 40 -->
123-
<jacoco.plugin>0.8.11</jacoco.plugin>
124-
125123
<!-- Set byte buddy to experimental -->
126124
<net.bytebuddy.experimental>true</net.bytebuddy.experimental>
127125
</properties>
@@ -167,7 +165,7 @@
167165
<dependency>
168166
<groupId>org.apache.derby</groupId>
169167
<artifactId>derby</artifactId>
170-
<version>10.16.1.1</version>
168+
<version>${derby.version}</version>
171169
<scope>test</scope>
172170
</dependency>
173171

@@ -460,4 +458,34 @@
460458
</plugin>
461459
</plugins>
462460
</build>
461+
462+
<profiles>
463+
<profile>
464+
<id>pre16</id>
465+
<activation>
466+
<jdk>(,16)</jdk>
467+
</activation>
468+
<properties>
469+
<derby.version>10.15.2.0</derby.version>
470+
</properties>
471+
</profile>
472+
<profile>
473+
<id>17</id>
474+
<activation>
475+
<jdk>[17,)</jdk>
476+
</activation>
477+
<properties>
478+
<derby.version>10.16.1.1</derby.version>
479+
</properties>
480+
</profile>
481+
<profile>
482+
<id>19</id>
483+
<activation>
484+
<jdk>[19,)</jdk>
485+
</activation>
486+
<properties>
487+
<derby.version>10.17.1.0</derby.version>
488+
</properties>
489+
</profile>
490+
</profiles>
463491
</project>

0 commit comments

Comments
 (0)