Author: hughesj
Date: Fri Jul 29 12:23:46 2011
New Revision: 1152184
URL: http://svn.apache.org/viewvc?rev=1152184&view=rev
Log:
ARIES-717: get Equinox 3.7 from maven
Added:
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.v20110613.xml
- copied, changed from r1151785,
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml
Removed:
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml
Modified:
aries/trunk/jpa/jpa-container-itest/pom.xml
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
aries/trunk/jpa/jpa-container-itest/src/test/resources/ss-runner.properties
Modified: aries/trunk/jpa/jpa-container-itest/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/pom.xml?rev=1152184&r1=1152183&r2=1152184&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-itest/pom.xml Fri Jul 29 12:23:46 2011
@@ -96,6 +96,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.7.0.v20110613</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<version>0.3.2-SNAPSHOT</version>
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java?rev=1152184&r1=1152183&r2=1152184&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java
Fri Jul 29 12:23:46 2011
@@ -79,6 +79,6 @@ public abstract class JPAWeavingAndAnnot
mavenBundle("org.apache.aries.jpa",
"org.apache.aries.jpa.container.advanced.itest.bundle"),
PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
- equinox().version("3.7.0.v20110304"));
+ equinox().version("3.7.0.v20110613"));
}
}
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1152184&r1=1152183&r2=1152184&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
Fri Jul 29 12:23:46 2011
@@ -42,7 +42,7 @@ public class SsActivator extends Abstrac
new EquinoxPlatformBuilder( bundleContext, "3.5.0" ),
new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
- new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110304" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110613" ),
new EquinoxPlatformBuilderSnapshot( bundleContext )
};
}
Copied:
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.v20110613.xml
(from r1151785,
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml)
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.v20110613.xml?p2=aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.v20110613.xml&p1=aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml&r1=1151785&r2=1152184&rev=1152184&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.V20110304.xml
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/resources/META-INF/platform-equinox/definition-3.7.0.v20110613.xml
Fri Jul 29 12:23:46 2011
@@ -1,7 +1,7 @@
<platform>
<name>Equinox 3.7.0</name>
-
<system>http://archive.eclipse.org/equinox/drops/S-3.7M6-201103101119/org.eclipse.osgi_3.7.0.v20110304.jar</system>
+ <system>mvn:org.eclipse.tycho/org.eclipse.osgi/3.7.0.v20110613</system>
<profile name="minimal" default="true"/>
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/resources/ss-runner.properties
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/resources/ss-runner.properties?rev=1152184&r1=1152183&r2=1152184&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-itest/src/test/resources/ss-runner.properties
(original)
+++ aries/trunk/jpa/jpa-container-itest/src/test/resources/ss-runner.properties
Fri Jul 29 12:23:46 2011
@@ -64,7 +64,7 @@ platform.equinox.3.5.1=org.ops4j.pax.run
platform.equinox.3.6.0=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
-platform.equinox.3.7.0.V20110304=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.7.0.V20110613=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
# Felix
platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator
platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator
