You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/02/10 20:41:45 UTC
svn commit: r1782523 - in /qpid/java/trunk: bdbstore/systests/pom.xml
pom.xml qpid-perftests-systests/pom.xml qpid-systests-parent/pom.xml
systests/pom.xml systests/qpid-systests-jms_2.0/pom.xml
Author: orudyy
Date: Fri Feb 10 20:41:45 2017
New Revision: 1782523
URL: http://svn.apache.org/viewvc?rev=1782523&view=rev
Log:
[NO-JIRA] Upgrade qpid jms client dependency to version 0.20.0
Modified:
qpid/java/trunk/bdbstore/systests/pom.xml
qpid/java/trunk/pom.xml
qpid/java/trunk/qpid-perftests-systests/pom.xml
qpid/java/trunk/qpid-systests-parent/pom.xml
qpid/java/trunk/systests/pom.xml
qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml
Modified: qpid/java/trunk/bdbstore/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/pom.xml (original)
+++ qpid/java/trunk/bdbstore/systests/pom.xml Fri Feb 10 20:41:45 2017
@@ -44,12 +44,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-bdbstore</artifactId>
<version>${project.version}</version>
@@ -129,4 +123,36 @@
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>addQpidJmsClientIfNecessary</id>
+ <activation>
+ <property>
+ <name>enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <!-- The 0-x client does not have a dependency on the JMS 1.1 spec. Add it now. -->
+ <id>addJms11IfNecessary</id>
+ <activation>
+ <property>
+ <name>!enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: qpid/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Fri Feb 10 20:41:45 2017
@@ -144,7 +144,7 @@
<junit-version>4.11</junit-version>
<mockito-version>1.9.5</mockito-version>
<httpclient-version>4.4</httpclient-version>
- <qpid-jms-client-version>0.11.0</qpid-jms-client-version>
+ <qpid-jms-client-version>0.20.0</qpid-jms-client-version>
<qpid-jms-client-ampq-0-x-version>6.1.1</qpid-jms-client-ampq-0-x-version>
<exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
Modified: qpid/java/trunk/qpid-perftests-systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/pom.xml (original)
+++ qpid/java/trunk/qpid-perftests-systests/pom.xml Fri Feb 10 20:41:45 2017
@@ -99,4 +99,36 @@
</testResources>
</build>
+
+ <profiles>
+ <profile>
+ <id>addQpidJmsClientIfNecessary</id>
+ <activation>
+ <property>
+ <name>enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <!-- The 0-x client does not have a dependency on the JMS 1.1 spec. Add it now. -->
+ <id>addJms11IfNecessary</id>
+ <activation>
+ <property>
+ <name>!enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: qpid/java/trunk/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Fri Feb 10 20:41:45 2017
@@ -232,35 +232,4 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>addQpidJmsClientIfNecessary</id>
- <activation>
- <property>
- <name>enableAmqp1-0</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-client</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <!-- The 0-x client does not have a dependency on the JMS 1.1 spec. Add it now. -->
- <id>addJms11IfNecessary</id>
- <activation>
- <property>
- <name>!enableAmqp1-0</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
Modified: qpid/java/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/systests/pom.xml (original)
+++ qpid/java/trunk/systests/pom.xml Fri Feb 10 20:41:45 2017
@@ -189,4 +189,36 @@
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>addQpidJmsClientIfNecessary</id>
+ <activation>
+ <property>
+ <name>enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <!-- The 0-x client does not have a dependency on the JMS 1.1 spec. Add it now. -->
+ <id>addJms11IfNecessary</id>
+ <activation>
+ <property>
+ <name>!enableAmqp1-0</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml?rev=1782523&r1=1782522&r2=1782523&view=diff
==============================================================================
--- qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml (original)
+++ qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml Fri Feb 10 20:41:45 2017
@@ -34,6 +34,10 @@
<test.working.directory>${basedir}/../..</test.working.directory>
<test.resource.directory>${basedir}/../..</test.resource.directory>
<test.systest.resource.directory>${basedir}/../../systests</test.systest.resource.directory>
+ <profile.broker.version>v1_0</profile.broker.version>
+ <profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
+ <profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
+ <profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
</properties>
<dependencies>
@@ -46,10 +50,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-client</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -68,74 +68,10 @@
<optional>true</optional>
</dependency>
-
- <!-- TODO remove the following JMS 1.1 exclusion and the explict JMS 2.0 inclusion once the released qpid-jms-client depends on JMS 2.0 -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency>
</dependencies>
- <!-- TODO Turn off the JMS 2.0 tests by default. Remove once the released qpid-jms-client depends on JMS 2.0 -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>jms20systests</id>
- <activation>
- <property>
- <name>qpid-jms-client-version</name>
- <value>0.20.0-SNAPSHOT</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org