X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=1416cfd53f58e72496cd7d07da9bc6e24038347a;hb=743ecb28b3c0236bc91a5d0993f70477236d96fd;hp=ca31afc531eaae88f21b5589b1bebe9587fe1c15;hpb=8dd0e17b4b13e8cddf4fb2478d003f3f643edb41;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index ca31afc53..1416cfd53 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -6,13 +6,13 @@
pom
Argeo SLC
0.11.3-SNAPSHOT
- SLC Distribution
http://www.argeo.org/projects/slc/${project.artifactId}/${project.version}
2.5.6.A
1.5.5.A
+ 1.1.3.RELEASE
2.0.9
1.7.0
6.1.14
@@ -49,7 +49,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.
]]>
-
+
@@ -85,7 +85,7 @@ limitations under the License.
maven-jar-plugin
- src/main/resources/META-INF/MANIFEST.MF
+ target/classes/META-INF/MANIFEST.MF
@@ -193,7 +193,7 @@ limitations under the License.
${version.maven-bundle-plugin}
true
- src/main/resources/META-INF
+ target/classes/META-INF
${pom.artifactId}
@@ -292,6 +292,11 @@ limitations under the License.
org.argeo.slc.server
${project.version}
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.equinox
+ ${project.version}
+
org.argeo.slc.runtime
org.argeo.slc.support.ws.client
@@ -348,7 +353,26 @@ limitations under the License.
com.springsource.javax.activation
1.1.1
- runtime
+
+
+ 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
@@ -393,6 +417,7 @@ limitations under the License.
com.springsource.slf4j.org.apache.log4j
1.5.3
+
org.springframework
@@ -466,7 +491,49 @@ 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.attrs
+ 2.2.0
@@ -585,14 +652,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
@@ -601,6 +660,12 @@ limitations under the License.
2.0.8
+
+
+ org.apache.catalina
+ com.springsource.org.apache.catalina
+ 6.0.18
+
@@ -711,6 +776,11 @@ limitations under the License.
com.springsource.org.apache.activemq.web
${version.activemq}
+
+ org.apache.activemq
+ com.springsource.org.apache.activemq.pool
+ ${version.activemq}
+