Commit a1b17991 authored by Nicolas Tachker's avatar Nicolas Tachker

JORAM-150: use the ow2-jms-2.0-spec instead of javax.jms-api.

parent e55f17c4
......@@ -15,7 +15,7 @@
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>javax.jms:javax.jms-api</include>
<include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-mom-core</include>
......
......@@ -42,8 +42,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.jonas.osgi</groupId>
......
......@@ -83,7 +83,7 @@
# file:bundle/joram-mom-core.jar \
# file:bundle/joram-mom-extensions-ftp.jar \
# file:bundle/joram-mom-extensions-mail.jar \
# file:bundle/geronimo-jms_1.1_spec-1.1.1.jar \
# file:bundle/ow2-jms-2.0-spec.jar \
# file:bundle/joram-mom-extensions-jmsbridge.jar
# file:bundle/a3-osgi.jar
......
......@@ -31,8 +31,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.spec.ee</groupId>
......
......@@ -94,8 +94,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
......
......@@ -61,8 +61,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
......
......@@ -20,8 +20,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.spec.ee</groupId>
......
......@@ -20,8 +20,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.ow2.spec.ee</groupId>
......
......@@ -43,8 +43,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
......
......@@ -174,7 +174,7 @@
<monolog.version>5.2.0</monolog.version>
<jcup.version>5.3.1</jcup.version>
<jftp.version>1.52</jftp.version>
<jms-api.version>2.0</jms-api.version>
<ow2-jms-2.0-spec.version>1.0.0</ow2-jms-2.0-spec.version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
<org.osgi.version>3.0.0</org.osgi.version>
<activation.version>1.1.1</activation.version>
......@@ -253,10 +253,10 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>${jms-api.version}</version>
</dependency>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
<version>${ow2-jms-2.0-spec.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-connector-1.5-spec</artifactId>
......
......@@ -369,8 +369,8 @@
<dependencies>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<groupId>org.ow2.spec.ee</groupId>
<artifactId>ow2-jms-2.0-spec</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.jonas.osgi</groupId>
......
......@@ -29,7 +29,7 @@
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>javax.jms:javax.jms-api</include>
<include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-mom-core</include>
......
......@@ -89,7 +89,7 @@ felix.auto.start.1= \
file:../../../ship/bundle/joram-mom-extensions-mail.jar \
file:../../../ship/bundle/joram-mom-extensions-collector.jar \
file:../../../ship/bundle/joram-mom-extensions-scheduler.jar \
file:../../../ship/bundle/javax.jms-api.jar \
file:../../../ship/bundle/ow2-jms-2.0-spec.jar \
file:../../../ship/bundle/jndi-client.jar \
file:../../../ship/bundle/joram-client-jms.jar \
file:../../../ship/bundle/joram-mom-extensions-jmsbridge.jar
......
......@@ -86,7 +86,7 @@ felix.auto.start.1= \
file:../../../ship/bundle/joram-mom-extensions-mail.jar \
file:../../../ship/bundle/joram-mom-extensions-collector.jar \
file:../../../ship/bundle/joram-mom-extensions-scheduler.jar \
file:../../../ship/bundle/javax.jms-api.jar \
file:../../../ship/bundle/ow2-jms-2.0-spec.jar \
file:../../../ship/bundle/jndi-client.jar \
file:../../../ship/bundle/joram-client-jms.jar \
file:../../../ship/bundle/joram-mom-extensions-jmsbridge.jar
......
......@@ -87,7 +87,7 @@ felix.auto.start.1= \
file:../../../ship/bundle/joram-mom-extensions-mail.jar \
file:../../../ship/bundle/joram-mom-extensions-collector.jar \
file:../../../ship/bundle/joram-mom-extensions-scheduler.jar \
file:../../../ship/bundle/javax.jms-api.jar \
file:../../../ship/bundle/ow2-jms-2.0-spec.jar \
file:../../../ship/bundle/jndi-client.jar \
file:../../../ship/bundle/joram-client-jms.jar \
file:../../../ship/bundle/joram-tools-jasp.jar
......
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