Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-01-12 10:58:41 -0500
committerBorislav Kapukaranov2012-01-12 10:58:41 -0500
commitc85851cbab4c8ecf7cf61b0d3ea56f401386c301 (patch)
tree5e084cfe84f4be0f671f8c4e61f8db689eb340bc
parentf3433222a859ff9fa0205f8168c484483f8624fb (diff)
parent97d3dde80699b4ae0ff5e351a4f8821bb718aa74 (diff)
downloadorg.eclipse.virgo.medic-c85851cbab4c8ecf7cf61b0d3ea56f401386c301.tar.gz
org.eclipse.virgo.medic-c85851cbab4c8ecf7cf61b0d3ea56f401386c301.tar.xz
org.eclipse.virgo.medic-c85851cbab4c8ecf7cf61b0d3ea56f401386c301.zip
Merge remote branch 'origin/364571-introduce-nano' into 364571-introduce-nano
Conflicts: org.eclipse.virgo.medic.core/.classpath
-rw-r--r--build.properties4
-rw-r--r--build.versions8
-rw-r--r--org.eclipse.virgo.medic.core/.classpath10
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.classpath4
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties10
5 files changed, 18 insertions, 18 deletions
diff --git a/build.properties b/build.properties
index b962259..cc52a09 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
-version=3.1.0
-release.type=integration
+version=3.1.0
+release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
ivy.cache=ivy-cache
ivy.cache.dir=${basedir}/../${ivy.cache}
diff --git a/build.versions b/build.versions
index aa37ad0..1e8b98a 100644
--- a/build.versions
+++ b/build.versions
@@ -10,7 +10,7 @@ org.aspectj=1.6.6.RELEASE
# Test
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.test=3.1.0.D-20111205152315
-org.eclipse.virgo.teststubs=3.1.0.D-20111205151304
-org.eclipse.virgo.util=3.1.0.D-20111205151812
-org.eclipse.virgo.osgi=3.1.0.D-20111205151528
+org.eclipse.virgo.test=3.1.0.M01
+org.eclipse.virgo.teststubs=3.1.0.M01
+org.eclipse.virgo.util=3.1.0.M01
+org.eclipse.virgo.osgi=3.1.0.M01
diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath
index dbaa32f..10bf1ea 100644
--- a/org.eclipse.virgo.medic.core/.classpath
+++ b/org.eclipse.virgo.medic.core/.classpath
@@ -25,16 +25,16 @@
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.D-20111205151304/org.eclipse.virgo.teststubs.osgi-3.1.0.D-20111205151304.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.D-20111205151304/org.eclipse.virgo.teststubs.osgi-sources-3.1.0.D-20111205151304.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.M01/org.eclipse.virgo.teststubs.osgi-3.1.0.M01.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.M01/org.eclipse.virgo.teststubs.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-sources-0.9.28.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-sources-0.9.28.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-3.1.0.D-20111205151812.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-sources-3.1.0.D-20111205151812.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-0.9.28.jar" sourcepath="/MEDIC_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="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-0.9.28.jar" sourcepath="/MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-3.1.0.M01.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-sources-1.0.300.v20101204.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-3.1.0.D-20111205151812.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-sources-3.1.0.D-20111205151812.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-sources-3.1.0.M01.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.bridge/1.6.1/com.springsource.slf4j.bridge-1.6.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index 6891e1c..04a1bdb 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -26,14 +26,14 @@
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-0.9.28.jar" sourcepath="/MEDIC_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="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-0.9.28.jar" sourcepath="/MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.D-20111205152315/org.eclipse.virgo.test.framework-3.1.0.D-20111205152315.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.D-20111205152315/org.eclipse.virgo.test.framework-sources-3.1.0.D-20111205152315.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.M01/org.eclipse.virgo.test.framework-3.1.0.M01.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.1.0.M01/org.eclipse.virgo.test.framework-sources-3.1.0.M01.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="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-3.1.0.D-20111205151812.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-sources-3.1.0.D-20111205151812.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.M01/org.eclipse.virgo.util.common-3.1.0.M01.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.M01/org.eclipse.virgo.util.common-sources-3.1.0.M01.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index abe059d..9a7b3bb 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -1,11 +1,11 @@
launcher.bundles=\
file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/${org.slf4j}/com.springsource.slf4j.api-${org.slf4j}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.D-20111205151812/org.eclipse.virgo.util.common-3.1.0.D-20111205151812.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.D-20111205151812/org.eclipse.virgo.util.osgi-3.1.0.D-20111205151812.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.D-20111205151812/org.eclipse.virgo.util.io-3.1.0.D-20111205151812.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.1.0.D-20111205151812/org.eclipse.virgo.util.math-3.1.0.D-20111205151812.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.D-20111205151812/org.eclipse.virgo.util.parser.manifest-3.1.0.D-20111205151812.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.1.0.M01/org.eclipse.virgo.util.common-3.1.0.M01.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-3.1.0.M01.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.1.0.M01/org.eclipse.virgo.util.io-3.1.0.M01.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.1.0.M01/org.eclipse.virgo.util.math-3.1.0.M01.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.1.0.M01/org.eclipse.virgo.util.parser.manifest-3.1.0.M01.jar,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.bridge/${org.slf4j}/com.springsource.slf4j.bridge-${org.slf4j}.jar,\

Back to the top