Skip to content

Commit

Permalink
Merge pull request #880 from hazendaz/master
Browse files Browse the repository at this point in the history
Remove jacoco override (not needed) and rework of derby per jdk
  • Loading branch information
hazendaz authored Nov 12, 2023
2 parents 8741b17 + b5fcb5e commit 5bc47ac
Showing 1 changed file with 32 additions and 4 deletions.
36 changes: 32 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<java.version>17</java.version>
<java.release.version>17</java.release.version>

<derby.version>10.17.1.0</derby.version>
<mybatis.version>3.5.14</mybatis.version>
<spring.version>6.0.13</spring.version>
<spring-batch.version>5.0.3</spring-batch.version>
Expand All @@ -119,9 +120,6 @@
<!-- Reproducible Builds -->
<project.build.outputTimestamp>1684514485</project.build.outputTimestamp>

<!-- TODO: Remove this after mybatis-parent 40 -->
<jacoco.plugin>0.8.11</jacoco.plugin>

<!-- Set byte buddy to experimental -->
<net.bytebuddy.experimental>true</net.bytebuddy.experimental>
</properties>
Expand Down Expand Up @@ -167,7 +165,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.16.1.1</version>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -460,4 +458,34 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>pre16</id>
<activation>
<jdk>(,16)</jdk>
</activation>
<properties>
<derby.version>10.15.2.0</derby.version>
</properties>
</profile>
<profile>
<id>17</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<properties>
<derby.version>10.16.1.1</derby.version>
</properties>
</profile>
<profile>
<id>19</id>
<activation>
<jdk>[19,)</jdk>
</activation>
<properties>
<derby.version>10.17.1.0</derby.version>
</properties>
</profile>
</profiles>
</project>

0 comments on commit 5bc47ac

Please sign in to comment.