Skip to content

Commit

Permalink
Merge pull request #559 from hazendaz/master
Browse files Browse the repository at this point in the history
Use my coveralls fork to drop bind api and add profile so we can use bnd 7.0.0 with java 17+
  • Loading branch information
hazendaz authored Nov 18, 2023
2 parents 3ee6be3 + 32c34cd commit a6b0677
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,7 @@
<!-- Dependency versions -->
<asm.version>9.6</asm.version>
<base-bundle.version>11</base-bundle.version>
<bind-api.version>2.3.3</bind-api.version>
<bnd.version>6.4.1</bnd.version>
<bnd.version>7.0.0</bnd.version>
<build-tools.version>1.3.1</build-tools.version>
<checkstyle.version>10.12.5</checkstyle.version>
<extra-enforcer-rules.version>1.7.0</extra-enforcer-rules.version>
Expand All @@ -328,7 +327,7 @@
<clean.plugin>3.3.2</clean.plugin>
<clirr.plugin>2.8</clirr.plugin>
<compiler.plugin>3.11.0</compiler.plugin>
<coveralls.plugin>4.4.1</coveralls.plugin>
<coveralls.plugin>4.5.0-M2</coveralls.plugin>
<dependency.plugin>3.6.1</dependency.plugin>
<deploy.plugin>3.1.1</deploy.plugin>
<enforcer.plugin>3.4.1</enforcer.plugin>
Expand Down Expand Up @@ -481,16 +480,9 @@
</plugin>

<plugin>
<groupId>io.jsonwebtoken.coveralls</groupId>
<groupId>com.github.hazendaz.maven</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls.plugin}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${bind-api.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand Down Expand Up @@ -1399,6 +1391,16 @@
</pluginManagement>
</build>
</profile>

<profile>
<id>pre17</id>
<activation>
<jdk>(,17)</jdk>
</activation>
<properties>
<bnd.version>6.4.1</bnd.version>
</properties>
</profile>
</profiles>

</project>

0 comments on commit a6b0677

Please sign in to comment.