X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=6df9fd04fa7d0a6ba2988cdcc9adec053778e61c;hb=8e097b1470aab6e956108acdbc5ddcd78488beec;hp=54e1ecaad794f8a75b6a7efe7ffb64a745c177c3;hpb=49d1ccd3b9f4d55d90de5e956a44bdbe83f600ef;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 54e1ecaad..6df9fd04f 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -12,11 +12,13 @@
2.5.6.A
1.5.5.A
+ 1.1.3.RELEASE
2.0.9
1.7.0
6.1.14
+ 3.4.2.R34x_v20080826-1230
1.4.3
- 5.2.0
+
scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
@@ -48,7 +50,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
]]>
-
+
@@ -84,7 +86,7 @@ limitations under the License.
maven-jar-plugin
- src/main/resources/META-INF/MANIFEST.MF
+ target/classes/META-INF/MANIFEST.MF
@@ -192,7 +194,7 @@ limitations under the License.
${version.maven-bundle-plugin}
true
- src/main/resources/META-INF
+ target/classes/META-INF
${pom.artifactId}
@@ -293,7 +295,7 @@ limitations under the License.
org.argeo.slc.runtime
- org.argeo.slc.execution
+ org.argeo.slc.support.equinox
${project.version}
@@ -353,6 +355,26 @@ limitations under the License.
1.1.1
+
+ javax.annotation
+ com.springsource.javax.annotation
+ 1.0.0
+
+
+ javax.persistence
+ com.springsource.javax.persistence
+ 1.0.0
+
+
+ javax.xml.ws
+ com.springsource.javax.xml.ws
+ 2.1.1
+
+
+ javax.xml.bind
+ com.springsource.javax.xml.bind
+ 2.1.7
+
@@ -396,6 +418,7 @@ limitations under the License.
com.springsource.slf4j.org.apache.log4j
1.5.3
+
org.springframework
@@ -469,7 +492,54 @@ limitations under the License.
org.springframework.osgi
org.springframework.osgi.extender
- 1.1.2.B
+ ${version.spring-osgi}
+
+
+ org.springframework.osgi
+ org.springframework.osgi.core
+ ${version.spring-osgi}
+
+
+ org.springframework.osgi
+ org.springframework.osgi.web.extender
+ ${version.spring-osgi}
+
+
+ org.springframework.osgi
+ org.springframework.osgi.web
+ ${version.spring-osgi}
+
+
+ org.argeo.slc.dep.osgi
+ org.argeo.dep.osgi.catalina.start
+ 1.0.0
+
+
+
+
+ org.aspectj
+ com.springsource.org.aspectj.runtime
+ 1.6.2.RELEASE
+
+
+ org.aspectj
+ com.springsource.org.aspectj.weaver
+ 1.6.2.RELEASE
+
+
+ net.sourceforge.cglib
+ com.springsource.net.sf.cglib
+ 2.1.3
+
+
+ org.objectweb.asm
+ com.springsource.org.objectweb.asm
+ 2.2.0
+
+
+ org.objectweb.asm
+ com.springsource.org.objectweb.asm.attrs
+ 2.2.0
@@ -588,14 +658,6 @@ limitations under the License.
com.springsource.javax.activation
1.1.1
-
-
- org.aspectj
-
- com.springsource.org.aspectj.weaver
-
- 1.6.2.RELEASE
-
com.lowagie.text
@@ -604,6 +666,12 @@ limitations under the License.
2.0.8
+
+
+ org.apache.catalina
+ com.springsource.org.apache.catalina
+ 6.0.18
+
@@ -644,7 +712,7 @@ limitations under the License.
org.eclipse.osgi
org.eclipse.osgi
- 3.4.2.R34x_v20080826-1230
+ ${version.equinox}
@@ -704,28 +772,34 @@ limitations under the License.
-
- org.apache.activemq
+
-
- org.apache.xbean
+
+
+ org.argeo.dep.osgi
+ org.argeo.dep.osgi.activemq
+ 5.2.0.argeo.3
+
+
+
+ org.apache.camel
+ com.springsource.org.apache.camel
+ 1.3.0
@@ -749,7 +823,8 @@ limitations under the License.
com.springsource.repository.bundles.release
SpringSource Enterprise Bundle Repository - SpringSource
- Bundle Releases
+ Bundle
+ Releases
http://repository.springsource.com/maven/bundles/release
@@ -769,7 +844,8 @@ limitations under the License.
com.springsource.repository.bundles.external
SpringSource Enterprise Bundle Repository - External
- Bundle Releases
+ Bundle
+ Releases
http://repository.springsource.com/maven/bundles/external