diff --git a/samples/blog/blog-comment-ejb/pom.xml b/samples/blog/blog-comment-ejb/pom.xml index 539cf51e3f..e166521433 100644 --- a/samples/blog/blog-comment-ejb/pom.xml +++ b/samples/blog/blog-comment-ejb/pom.xml @@ -51,7 +51,7 @@ compile - + @@ -66,7 +66,7 @@ - + run diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index e6d3f8bd1c..18021c46a1 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -33,18 +33,22 @@ 4.0 3.2.0-v20070116 + 1.4 1.2 - 3.4.0 + 4.13.5 + 8 + 1 0.9.29 - 2.0.0-SNAPSHOT + 3.8.0.v20120529-1548 + 1.1.0 + 1.6.6 3.0.0 3.1.0 3.1.200-v20070605 - 1.7.7 1.7.0 2.0.0 - 1.6.0 + 2.6.16 3.16 @@ -78,11 +82,17 @@ test + + + + + + + - org.apache.aries.testsupport - org.apache.aries.testsupport.unit - ${org.apache.aries.testsupport.unit.version} - test + javax.inject + javax.inject + ${javax.inject.version} @@ -381,7 +391,6 @@ org.slf4j slf4j-api - ${slf4j-api.version} org.ops4j.pax.exam @@ -441,6 +450,12 @@ junit test + + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + @@ -462,7 +477,8 @@ org.apache.maven.plugins maven-surefire-plugin - pertest + 1 + false diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/itest b/samples/blog/blog-itests/src/test/java/org/apache/aries/itest new file mode 120000 index 0000000000..5e145ea8ae --- /dev/null +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/itest @@ -0,0 +1 @@ +../../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest \ No newline at end of file diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 6fc4530d33..1eb2cbc605 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -159,7 +159,7 @@ protected Option baseOptions() { junitBundles(), mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"), mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"), - mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), +// mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), // this is how you set the default log level when using pax // logging (logProfile) systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), @@ -199,6 +199,7 @@ public Option[] configuration() { mavenBundle("commons-lang", "commons-lang").versionAsInProject(), mavenBundle("commons-collections", "commons-collections").versionAsInProject(), mavenBundle("commons-pool", "commons-pool").versionAsInProject(), + mavenBundle("commons-dbcp", "commons-dbcp").versionAsInProject(), mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp").versionAsInProject(), mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(), mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(), diff --git a/samples/blog/blog-persistence-jpa/pom.xml b/samples/blog/blog-persistence-jpa/pom.xml index 8fe1944992..6cb158160c 100644 --- a/samples/blog/blog-persistence-jpa/pom.xml +++ b/samples/blog/blog-persistence-jpa/pom.xml @@ -51,7 +51,7 @@ compile - + @@ -67,7 +67,7 @@ - + run diff --git a/samples/blog/pom.xml b/samples/blog/pom.xml index 0f88460d6c..42c33e113f 100644 --- a/samples/blog/pom.xml +++ b/samples/blog/pom.xml @@ -30,6 +30,10 @@ pom + + 1.6 + + 2.5.0 3.7.0.v20110613 diff --git a/samples/pom.xml b/samples/pom.xml index aa322d24b7..4d5856ee0b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -687,7 +687,7 @@ ariestrader - + blog blueprint