Commit 5bbdca8c authored by Andy Wilkinson's avatar Andy Wilkinson

Use offical JSON API jar rather than Geronimo's in Artemis starter

Closes gh-14691
parent 8a7d1276
...@@ -1374,6 +1374,12 @@ ...@@ -1374,6 +1374,12 @@
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-core-client</artifactId> <artifactId>artemis-core-client</artifactId>
<version>${artemis.version}</version> <version>${artemis.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
...@@ -1384,6 +1390,12 @@ ...@@ -1384,6 +1390,12 @@
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-server</artifactId> <artifactId>artemis-jms-server</artifactId>
<version>${artemis.version}</version> <version>${artemis.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>
...@@ -1409,6 +1421,10 @@ ...@@ -1409,6 +1421,10 @@
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -36,5 +36,9 @@ ...@@ -36,5 +36,9 @@
<groupId>javax.jms</groupId> <groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId> <artifactId>javax.jms-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment