You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/04/29 09:17:12 UTC
svn commit: r1676683 - in /aries/trunk/application/application-itests: ./
src/test/java/org/apache/aries/application/runtime/itests/
Author: cschneider
Date: Wed Apr 29 07:17:12 2015
New Revision: 1676683
URL: http://svn.apache.org/r1676683
Log:
[ARIES-1315] Upgrade to pax exam 4.5.0
Added:
aries/trunk/application/application-itests/test.eba
aries/trunk/application/application-itests/test2-resolved.eba
aries/trunk/application/application-itests/test2.eba
Modified:
aries/trunk/application/application-itests/pom.xml
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Wed Apr 29 07:17:12 2015
@@ -44,8 +44,8 @@
</scm>
<properties>
- <exam.version>3.4.0</exam.version>
- <url.version>1.6.0</url.version>
+ <exam.version>4.5.0</exam.version>
+ <url.version>2.2.0</url.version>
</properties>
<dependencies>
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Wed Apr 29 07:17:12 2015
@@ -147,8 +147,6 @@ public class BasicAppManagerTest extends
return options(
// framework / core bundles
- mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Wed Apr 29 07:17:12 2015
@@ -124,7 +124,6 @@ public class BasicNoOpResolverTest exten
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
@@ -134,7 +133,6 @@ public class BasicNoOpResolverTest exten
// Bundles
junitBundles(),
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java Wed Apr 29 07:17:12 2015
@@ -367,7 +367,6 @@ public class IsolatedCfgAdminRuntimeTest
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Wed Apr 29 07:17:12 2015
@@ -315,7 +315,6 @@ public class IsolatedRuntimeTest extends
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Wed Apr 29 07:17:12 2015
@@ -174,7 +174,6 @@ public class MinimumImportsTest extends
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Wed Apr 29 07:17:12 2015
@@ -155,7 +155,6 @@ public class OBRAppManagerTest extends A
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Wed Apr 29 07:17:12 2015
@@ -532,7 +532,6 @@ public class OBRResolverAdvancedTest ext
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Wed Apr 29 07:17:12 2015
@@ -318,7 +318,6 @@ public class OBRResolverTest extends Abs
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1676683&r1=1676682&r2=1676683&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Wed Apr 29 07:17:12 2015
@@ -256,7 +256,6 @@ public class UpdateAppTest extends Abstr
// framework / core bundles
mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(),
- mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(),
mavenBundle("org.ops4j.pax.logging", "pax-logging-service").versionAsInProject(),
Added: aries/trunk/application/application-itests/test.eba
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/test.eba?rev=1676683&view=auto
==============================================================================
Binary files aries/trunk/application/application-itests/test.eba (added) and aries/trunk/application/application-itests/test.eba Wed Apr 29 07:17:12 2015 differ
Added: aries/trunk/application/application-itests/test2-resolved.eba
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/test2-resolved.eba?rev=1676683&view=auto
==============================================================================
Binary files aries/trunk/application/application-itests/test2-resolved.eba (added) and aries/trunk/application/application-itests/test2-resolved.eba Wed Apr 29 07:17:12 2015 differ
Added: aries/trunk/application/application-itests/test2.eba
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/test2.eba?rev=1676683&view=auto
==============================================================================
Binary files aries/trunk/application/application-itests/test2.eba (added) and aries/trunk/application/application-itests/test2.eba Wed Apr 29 07:17:12 2015 differ