Skip to content

Commit 2cad800

Browse files
committed
Exclude old artifactIds in favor of new ones
* javax.annotation:jsr250-api -> javax.annotation:javax.annotation-api * javax.transaction:jta -> javax.transaction:javax.transaction-api Unfortunately, this may result in runtime issues if the artifacts in question (jetty-jspc-maven-plugin and omero-model, respectively) are depended upon without the newer artifacts on the classpath as well. But Maven does not have a built-in way to add dependencies to a managed artifact, so what can you do? Maybe we add a smart dependency checking step to scijava-maven-plugin the future to catch these sorts of things?
1 parent ac54d3a commit 2cad800

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,6 +2515,13 @@
25152515
<groupId>org.openmicroscopy</groupId>
25162516
<artifactId>omero-model</artifactId>
25172517
<version>${omero-model.version}</version>
2518+
<exclusions>
2519+
<exclusion>
2520+
<!-- Conflicts with javax.transaction:javax.transaction-api -->
2521+
<groupId>javax.transaction</groupId>
2522+
<artifactId>jta</artifactId>
2523+
</exclusion>
2524+
</exclusions>
25182525
</dependency>
25192526

25202527
<!-- OMERO Renderer - https://github.com/ome/omero-renderer -->
@@ -3399,6 +3406,13 @@
33993406
<groupId>org.eclipse.jetty</groupId>
34003407
<artifactId>jetty-jspc-maven-plugin</artifactId>
34013408
<version>${jetty-jspc-maven-plugin.version}</version>
3409+
<exclusions>
3410+
<exclusion>
3411+
<!-- Conflicts with javax.annotation:javax.annotation-api -->
3412+
<groupId>javax.annotation</groupId>
3413+
<artifactId>jsr250-api</artifactId>
3414+
</exclusion>
3415+
</exclusions>
34023416
</dependency>
34033417
<dependency>
34043418
<groupId>org.eclipse.jetty</groupId>

0 commit comments

Comments
 (0)