You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/12/16 12:17:00 UTC
svn commit: r1551177 - in /qpid/branches/0.26/qpid/java: ./ bdbstore/pom.xml
broker-plugins/derby-store/pom.xml
broker-plugins/jdbc-provider-bone/pom.xml broker-plugins/jdbc-store/pom.xml
broker-plugins/memory-store/pom.xml
Author: robbie
Date: Mon Dec 16 11:16:59 2013
New Revision: 1551177
URL: http://svn.apache.org/r1551177
Log:
QPID-5048: [Maven build system] Fix poms so that resources beneath the nonstandard src/main/java/resources are also included in the jar artifacts.
This problem prevented the proper creation of virtual hosts when using builds created by Maven.
merged from trunk r1542317
Modified:
qpid/branches/0.26/qpid/java/ (props changed)
qpid/branches/0.26/qpid/java/bdbstore/pom.xml
qpid/branches/0.26/qpid/java/broker-plugins/derby-store/pom.xml
qpid/branches/0.26/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/pom.xml
qpid/branches/0.26/qpid/java/broker-plugins/memory-store/pom.xml
Propchange: qpid/branches/0.26/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1542317
Modified: qpid/branches/0.26/qpid/java/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/bdbstore/pom.xml?rev=1551177&r1=1551176&r2=1551177&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/bdbstore/pom.xml (original)
+++ qpid/branches/0.26/qpid/java/bdbstore/pom.xml Mon Dec 16 11:16:59 2013
@@ -86,6 +86,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>resources/</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: qpid/branches/0.26/qpid/java/broker-plugins/derby-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-plugins/derby-store/pom.xml?rev=1551177&r1=1551176&r2=1551177&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/broker-plugins/derby-store/pom.xml (original)
+++ qpid/branches/0.26/qpid/java/broker-plugins/derby-store/pom.xml Mon Dec 16 11:16:59 2013
@@ -59,6 +59,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>resources/</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: qpid/branches/0.26/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml?rev=1551177&r1=1551176&r2=1551177&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml (original)
+++ qpid/branches/0.26/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml Mon Dec 16 11:16:59 2013
@@ -58,6 +58,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>resources/</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/pom.xml?rev=1551177&r1=1551176&r2=1551177&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/pom.xml (original)
+++ qpid/branches/0.26/qpid/java/broker-plugins/jdbc-store/pom.xml Mon Dec 16 11:16:59 2013
@@ -59,6 +59,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>resources/</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: qpid/branches/0.26/qpid/java/broker-plugins/memory-store/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/java/broker-plugins/memory-store/pom.xml?rev=1551177&r1=1551176&r2=1551177&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/java/broker-plugins/memory-store/pom.xml (original)
+++ qpid/branches/0.26/qpid/java/broker-plugins/memory-store/pom.xml Mon Dec 16 11:16:59 2013
@@ -36,6 +36,17 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>resources/</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org