Updated pax confman lib to 2.3 version (CQ 21681)
Change-Id: I446fcd451ac432124a545dffa29713e09adf0e3c
Signed-off-by: Guillaume Garzone <guillaume.garzone@laas.fr>
diff --git a/org.eclipse.om2m.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar b/org.eclipse.om2m.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar
new file mode 100644
index 0000000..d71bead
--- /dev/null
+++ b/org.eclipse.om2m.site.in-cse/libs/pax-confman-propsloader-0.2.3.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar b/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar
deleted file mode 100644
index 54bc8ae..0000000
--- a/org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.om2m.site.in-cse/pom.xml b/org.eclipse.om2m.site.in-cse/pom.xml
index 4556693..684b388 100644
--- a/org.eclipse.om2m.site.in-cse/pom.xml
+++ b/org.eclipse.om2m.site.in-cse/pom.xml
@@ -72,10 +72,13 @@
todir="${basedir}/target/products/in-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/configurations">
<fileset dir="${basedir}/configurations" includes="**/*" />
</copy>
+ <copy file="${basedir}/libs/pax-confman-propsloader-0.2.3.jar"
+ todir="${basedir}/target/products/in-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/" />
+
<propertyfile
file="${basedir}/target/products/in-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/configuration/config.ini">
<entry key="osgi.bundles" type="string" operation="+"
- value=", reference:file:pax-confman-propsloader-0.2.2.jar@1:start" />
+ value=", reference:file:pax-confman-propsloader-0.2.3.jar@1:start" />
</propertyfile>
</tasks>
</configuration>
diff --git a/org.eclipse.om2m.site.mn-cse/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar b/org.eclipse.om2m.site.mn-cse/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
similarity index 100%
rename from org.eclipse.om2m.site.mn-cse/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
rename to org.eclipse.om2m.site.mn-cse/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar b/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar
new file mode 100644
index 0000000..d71bead
--- /dev/null
+++ b/org.eclipse.om2m.site.mn-cse/libs/pax-confman-propsloader-0.2.3.jar
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar b/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar
deleted file mode 100644
index 54bc8ae..0000000
--- a/org.eclipse.om2m.site.mn-cse/pax-confman-propsloader-0.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.om2m.site.mn-cse/pom.xml b/org.eclipse.om2m.site.mn-cse/pom.xml
index 82176bb..224d1ac 100644
--- a/org.eclipse.om2m.site.mn-cse/pom.xml
+++ b/org.eclipse.om2m.site.mn-cse/pom.xml
@@ -67,10 +67,10 @@
tofile="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/start.bat" />
<copy file="${basedir}/log4j.configuration"
tofile="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/log4j.configuration" />
- <!-- <copy file="${basedir}/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar"
+ <!-- <copy file="${basedir}/libs/org.eclipse.equinox.cm_1.0.400.v20130327-1442.jar"
todir="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/"
/> -->
- <copy file="${basedir}/pax-confman-propsloader-0.2.2.jar"
+ <copy file="${basedir}/libs/pax-confman-propsloader-0.2.3.jar"
todir="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/plugins/" />
<copy
todir="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/configurations">
@@ -81,7 +81,7 @@
<propertyfile
file="${basedir}/target/products/mn-cse/${osgi.os}/${osgi.ws}/${osgi.arch}/configuration/config.ini">
<entry key="osgi.bundles" type="string" operation="+"
- value=", reference:file:pax-confman-propsloader-0.2.2.jar@1:start" />
+ value=", reference:file:pax-confman-propsloader-0.2.3.jar@1:start" />
</propertyfile>
</target>
</configuration>
