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 2018/10/31 12:15:33 UTC
qpid-broker-j git commit: QPID-7885: [Broker-J] Change JMS client
maven dependecy scope from 'compile' to 'runtime'
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 35998c406 -> 2779e06b0
QPID-7885: [Broker-J] Change JMS client maven dependecy scope from 'compile' to 'runtime'
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/2779e06b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/2779e06b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/2779e06b
Branch: refs/heads/master
Commit: 2779e06b0403bd815ea2c05a45b99348085b5b25
Parents: 35998c4
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Oct 31 11:49:46 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Oct 31 12:15:02 2018 +0000
----------------------------------------------------------------------
joramtests/pom.xml | 18 ++++++++++
perftests/pom.xml | 9 ++++-
pom.xml | 2 +-
qpid-perftests-systests/pom.xml | 35 ++++++++++----------
.../systest/disttest/endtoend/EndToEndTest.java | 11 +++---
systests/qpid-systests-spawn-admin/pom.xml | 7 ++--
tck/pom.xml | 7 ++++
tools/pom.xml | 28 ++++++++--------
8 files changed, 75 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/joramtests/pom.xml
----------------------------------------------------------------------
diff --git a/joramtests/pom.xml b/joramtests/pom.xml
index 6fdfce8..9397e77 100644
--- a/joramtests/pom.xml
+++ b/joramtests/pom.xml
@@ -236,6 +236,17 @@
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-amqp-1-0-client-jms</artifactId>
<version>${qpid-amqp-1-0-client-jms-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -258,6 +269,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -281,14 +293,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -311,14 +326,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/perftests/pom.xml
----------------------------------------------------------------------
diff --git a/perftests/pom.xml b/perftests/pom.xml
index b636cc1..9e92669 100644
--- a/perftests/pom.xml
+++ b/perftests/pom.xml
@@ -245,7 +245,7 @@
<phase>integration-test</phase>
<configuration>
<mainClass>org.apache.qpid.disttest.ControllerRunner</mainClass>
- <classpathScope>compile</classpathScope>
+ <classpathScope>runtime</classpathScope>
<arguments>
<argument>jndi-config=${java.naming.provider.url}</argument>
<argument>test-config=${perftests.test-config}</argument>
@@ -341,6 +341,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -362,14 +363,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -391,14 +395,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69442be..d2c6cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>2.3.1</version>
+ <version>${jaxb-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/qpid-perftests-systests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 447514c..4540a21 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -35,24 +35,6 @@
<artifactId>qpid-perftests</artifactId>
</dependency>
- <!-- client deps -->
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-client</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- other deps -->
<dependency>
@@ -125,6 +107,23 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+ <!-- client deps -->
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
----------------------------------------------------------------------
diff --git a/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java b/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
index 3935815..e2c0008 100644
--- a/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
+++ b/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
@@ -64,7 +64,8 @@ import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.tests.http.HttpTestBase;
import org.apache.qpid.tests.utils.BrokerAdmin;
import org.apache.qpid.tests.utils.ConfigItem;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.test.utils.TestFileUtils;
+
@ConfigItem(name = "qpid.initialConfigurationLocation", value = DEFAULT_BROKER_CONFIG )
public class EndToEndTest extends HttpTestBase
@@ -103,11 +104,11 @@ public class EndToEndTest extends HttpTestBase
{
if (_outputDir != null && _outputDir.exists())
{
- FileUtils.delete(_outputDir, true);
+ TestFileUtils.delete(_outputDir, true);
}
if (_jndiConfigFile != null)
{
- FileUtils.delete(_jndiConfigFile, true);
+ TestFileUtils.delete(_jndiConfigFile, true);
}
}
finally
@@ -287,14 +288,14 @@ public class EndToEndTest extends HttpTestBase
runner.runController();
}
- private String[] getCsvResults(final Map<String, String> args)
+ private String[] getCsvResults(final Map<String, String> args) throws IOException
{
String testConfig = args.get(TEST_CONFIG_PROP);
String expectedCsvFilename = buildOutputFilename(testConfig, ".csv");
File expectedCsvOutputFile = new File(_outputDir, expectedCsvFilename);
assertThat("CSV output file must exist", expectedCsvOutputFile.exists(), is(equalTo(true)));
- final String csvContents = FileUtils.readFileAsString(expectedCsvOutputFile);
+ final String csvContents = new String(Files.readAllBytes(expectedCsvOutputFile.toPath()));
return csvContents.split("\n");
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/systests/qpid-systests-spawn-admin/pom.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-spawn-admin/pom.xml b/systests/qpid-systests-spawn-admin/pom.xml
index d5ab714..6ca6bf0 100644
--- a/systests/qpid-systests-spawn-admin/pom.xml
+++ b/systests/qpid-systests-spawn-admin/pom.xml
@@ -64,6 +64,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -79,7 +80,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -89,12 +90,12 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index 707a4cc..1cbaa17 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -638,6 +638,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -660,14 +661,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -691,14 +695,17 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/2779e06b/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index b3d0f93..75d7feb 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -128,22 +128,22 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -175,22 +175,22 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -249,7 +249,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -259,12 +259,12 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
@@ -296,7 +296,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -306,12 +306,12 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <scope>compile</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org