Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVioleta Georgieva2014-07-13 09:30:17 -0400
committerVioleta Georgieva2014-07-13 09:30:17 -0400
commit325749674cfdd9477009a9398f442321a871cf0a (patch)
treece87dffc4eacbb5d9f149fcb4bccb2d575a8f370
parent34219e3918b5f085de364d072fe34b5a09ae6745 (diff)
parent7df86a942f2a2b40c76f2ecefc3b44a3f749c0af (diff)
downloadorg.eclipse.virgo.medic-325749674cfdd9477009a9398f442321a871cf0a.tar.gz
org.eclipse.virgo.medic-325749674cfdd9477009a9398f442321a871cf0a.tar.xz
org.eclipse.virgo.medic-325749674cfdd9477009a9398f442321a871cf0a.zip
Merge branch '3.6.x' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.medic into 3.6.x
Conflicts: org.eclipse.virgo.medic.core/.classpath org.eclipse.virgo.medic.integrationtest/.classpath
-rw-r--r--build.versions4
-rw-r--r--org.eclipse.virgo.medic.core/.classpath6
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.classpath4
3 files changed, 7 insertions, 7 deletions
diff --git a/build.versions b/build.versions
index f5e4622..7a38fdf 100644
--- a/build.versions
+++ b/build.versions
@@ -14,5 +14,5 @@ org.aspectj=1.6.12.RELEASE
# Test
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.test=3.6.2.RELEASE
-org.eclipse.virgo.util=3.6.2.RELEASE
+org.eclipse.virgo.test=3.6.3.D-20140712201806
+org.eclipse.virgo.util=3.6.3.D-20140712201020
diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath
index 518183e..ac86f22 100644
--- a/org.eclipse.virgo.medic.core/.classpath
+++ b/org.eclipse.virgo.medic.core/.classpath
@@ -28,11 +28,11 @@
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.2.RELEASE/org.eclipse.virgo.test.stubs-3.6.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120711092322/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120711092322.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.3.D-20140712201806/org.eclipse.virgo.test.stubs-3.6.3.D-20140712201806.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.3.D-20140712201806/org.eclipse.virgo.test.stubs-sources-3.6.3.D-20140712201806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.2.RELEASE/org.eclipse.virgo.util.osgi-3.6.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.2.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.D-20140712201020/org.eclipse.virgo.util.osgi-3.6.3.D-20140712201020.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.3.D-20140712201020/org.eclipse.virgo.util.osgi-sources-3.6.3.D-20140712201020.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.2.RELEASE/org.eclipse.virgo.util.io-3.6.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.2.RELEASE/org.eclipse.virgo.util.io-sources-3.6.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.3.D-20140712201020/org.eclipse.virgo.util.io-3.6.3.D-20140712201020.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.3.D-20140712201020/org.eclipse.virgo.util.io-sources-3.6.3.D-20140712201020.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.7.v20121108-1250/ch.qos.logback.classic-1.0.7.v20121108-1250.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.7.v20121108-1250/ch.qos.logback.core-1.0.7.v20121108-1250.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index b3ce84f..b79be98 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -26,14 +26,14 @@
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.7.v20121108-1250/ch.qos.logback.classic-1.0.7.v20121108-1250.jar" sourcepath="/IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.7.v20121108-1250/ch.qos.logback.core-1.0.7.v20121108-1250.jar" sourcepath="/IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.2.RELEASE/org.eclipse.virgo.test.stubs-3.6.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.2.RELEASE/org.eclipse.virgo.test.stubs-sources-3.6.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.3.D-20140712201806/org.eclipse.virgo.test.stubs-3.6.3.D-20140712201806.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.3.D-20140712201806/org.eclipse.virgo.test.stubs-sources-3.6.3.D-20140712201806.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="src" path="/org.eclipse.virgo.medic">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.2.RELEASE/org.eclipse.virgo.util.common-3.6.2.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.2.RELEASE/org.eclipse.virgo.util.common-sources-3.6.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.3.D-20140712201020/org.eclipse.virgo.util.common-3.6.3.D-20140712201020.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.3.D-20140712201020/org.eclipse.virgo.util.common-sources-3.6.3.D-20140712201020.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
<classpathentry kind="output" path="target/classes"/>

Back to the top