You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/12/23 12:07:15 UTC
[52/71] [abbrv] incubator-brooklyn git commit: [LIBRARY] add database
dependency for camp tests
[LIBRARY] add database dependency for camp tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3d920338
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3d920338
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3d920338
Branch: refs/heads/master
Commit: 3d92033887d3a04abe076c648abfe201e234448d
Parents: 1e748da
Author: John McCabe <jo...@johnmccabe.net>
Authored: Sat Dec 19 16:34:58 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 21 16:43:38 2015 +0000
----------------------------------------------------------------------
brooklyn-library/pom.xml | 2 +-
brooklyn-library/software/webapp/pom.xml | 6 ++++++
.../org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d920338/brooklyn-library/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-library/pom.xml b/brooklyn-library/pom.xml
index d0a2532..9c5eb5a 100644
--- a/brooklyn-library/pom.xml
+++ b/brooklyn-library/pom.xml
@@ -209,10 +209,10 @@
<module>software/network</module>
<module>software/osgi</module>
+ <module>software/database</module>
<module>software/webapp</module>
<module>software/messaging</module>
<module>software/nosql</module>
- <module>software/database</module>
<module>software/monitoring</module>
<module>qa</module>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d920338/brooklyn-library/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/pom.xml b/brooklyn-library/software/webapp/pom.xml
index b4b7443..6350d32 100644
--- a/brooklyn-library/software/webapp/pom.xml
+++ b/brooklyn-library/software/webapp/pom.xml
@@ -153,6 +153,12 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.brooklyn</groupId>
+ <artifactId>brooklyn-software-database</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- bring in camp test deps for moved tests -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d920338/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
index ed8ec33..a3479ec 100644
--- a/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
+++ b/brooklyn-library/software/webapp/src/test/java/org/apache/brooklyn/test/camp/JavaWebAppsMatchingTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.brooklyn.camp.brooklyn;
+package org.apache.brooklyn.test.camp;
import java.io.IOException;
import java.io.Reader;