Improve server structure

[gpl/argeo-slc.git] / org.argeo.slc / pom.xml

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 1416cfd53f58e72496cd7d07da9bc6e24038347a..a19a72f89b37b8f29d8f7bfb2f8432a17438542f 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -16,8 +16,10 @@
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
-               <version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-               <version.activemq>5.2.0</version.activemq>
+               <version.tomcat>6.0.18</version.tomcat>
+               <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+               <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+               <version.activemq>5.2.0.0005</version.activemq>
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -88,6 +90,13 @@ limitations under the License.
                                                        <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
                                                </archive>
                                        </configuration>
+                                       <executions>
+                                               <execution>
+                                                       <goals>
+                                                               <goal>test-jar</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
                                </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
@@ -163,7 +172,6 @@ limitations under the License.
                                                        <artifactId>com.springsource.javax.mail</artifactId>
                                                        <version>1.4.1</version>
                                                </dependency>
-
                                                <!--
                                                        Required by ActiveMQ admin <dependency>
                                                        <groupId>org.springframework</groupId>
@@ -267,6 +275,12 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.simple</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.simple</artifactId>
+                               <version>${project.version}</version>
+                               <classifier>tests</classifier>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
@@ -344,7 +358,6 @@ limitations under the License.
                                <artifactId>
                                        com.springsource.com.sun.xml.messaging.saaj
                                </artifactId>
-                               <scope>runtime</scope>
                                <version>1.3.0</version>
                        </dependency>
                        <dependency>
@@ -511,7 +524,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.slc.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-                               <version>1.0.0</version>
+                               <version>1.0.0.argeo.2</version>
                        </dependency>
 
                        <!-- AOP -->
@@ -525,15 +538,25 @@ limitations under the License.
                                <artifactId>com.springsource.org.aspectj.weaver</artifactId>
                                <version>1.6.2.RELEASE</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.aopalliance</groupId>
+                               <artifactId>com.springsource.org.aopalliance</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
                        <dependency>
                                <groupId>net.sourceforge.cglib</groupId>
                                <artifactId>com.springsource.net.sf.cglib</artifactId>
                                <version>2.1.3</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                               <version>1.5.3</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-                               <version>2.2.0</version>
+                               <version>1.5.3</version>
                        </dependency>
 
                        <!-- Ant -->
@@ -664,7 +687,17 @@ limitations under the License.
                        <dependency>
                                <groupId>org.apache.catalina</groupId>
                                <artifactId>com.springsource.org.apache.catalina</artifactId>
-                               <version>6.0.18</version>
+                               <version>${version.tomcat}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.jasper</groupId>
+                               <artifactId>com.springsource.org.apache.jasper</artifactId>
+                               <version>${version.tomcat}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.apache.el</groupId>
+                               <artifactId>com.springsource.org.apache.el</artifactId>
+                               <version>${version.tomcat}</version>
                        </dependency>
 
                        <!-- Maven -->
@@ -693,20 +726,10 @@ limitations under the License.
                        </dependency>
 
                        <!-- OSGi -->
-                       <!--
-                               <dependency> <groupId>org.apache.felix</groupId>
-                               <artifactId>org.apache.felix.main</artifactId>
-                               <version>1.2.1</version> <exclusions> <exclusion>
-                               <groupId>org.apache.felix</groupId> <artifactId>
-                               org.apache.felix.framework </artifactId> </exclusion> </exclusions>
-                               </dependency> <dependency> <groupId>org.apache.felix</groupId>
-                               <artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
-                               <scope>provided</scope> </dependency>
-                       -->
                        <dependency>
                                <groupId>org.eclipse.osgi</groupId>
                                <artifactId>org.eclipse.osgi</artifactId>
-                               <version>3.4.2.R34x_v20080826-1230</version>
+                               <version>${version.equinox}</version>
                        </dependency>
 
                        <!-- Auto UI -->
@@ -767,33 +790,32 @@ limitations under the License.
 
                        <!-- ActiveMQ -->
                        <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq</artifactId>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
+
                        <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
-                               <version>${version.activemq}</version>
+                               <groupId>javax.xml.soap</groupId>
+                               <artifactId>com.springsource.javax.xml.soap</artifactId>
+                               <version>1.3.0</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-pool</artifactId>
-                               <version>${version.activemq}</version> </dependency> <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-optional</artifactId>
-                               <version>${version.activemq}</version> </dependency>
-                       -->
                        <dependency>
-                               <groupId>org.apache.xbean</groupId>
-                               <artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-                               <version>3.3.0</version>
+                               <groupId>javax.xml.rpc</groupId>
+                               <artifactId>com.springsource.javax.xml.rpc</artifactId>
+                               <version>1.1.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.ejb</groupId>
+                               <artifactId>com.springsource.javax.ejb</artifactId>
+                               <version>3.0.0</version>
                        </dependency>
+
                        <dependency>
                                <groupId>org.apache.camel</groupId>
                                <artifactId>com.springsource.org.apache.camel</artifactId>