Update activemq version

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index fdc14c7bed6f9fa1dac3ff3e15bfe8322741f77b..fcf9d8b20722971091dabfba73ec220641c02044 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -6,18 +6,18 @@
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
        <version>0.11.3-SNAPSHOT</version>
-       <description>SLC Distribution</description>
        <url>
                http://www.argeo.org/projects/slc/${project.artifactId}/${project.version}
        </url>
        <properties>
                <version.spring>2.5.6.A</version.spring>
                <version.spring-ws>1.5.5.A</version.spring-ws>
+               <version.spring-osgi>1.1.3.RELEASE</version.spring-osgi>
                <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.activemq>5.2.0</version.activemq> -->
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -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.
 ]]>
-               </comments>
+                       </comments>
                </license>
        </licenses>
        <organization>
@@ -85,7 +85,7 @@ limitations under the License.
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <configuration>
                                                <archive>
-                                                       <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
                                                </archive>
                                        </configuration>
                                </plugin>
@@ -193,7 +193,7 @@ limitations under the License.
                                        <version>${version.maven-bundle-plugin}</version>
                                        <extensions>true</extensions>
                                        <configuration>
-                                               <manifestLocation>src/main/resources/META-INF</manifestLocation>
+                                               <manifestLocation>target/classes/META-INF</manifestLocation>
                                                <instructions>
                                                        <Bundle-SymbolicName>
                                                                ${pom.artifactId}
@@ -292,6 +292,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.server</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.equinox</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ws.client</artifactId>
@@ -349,6 +354,26 @@ limitations under the License.
                                </artifactId>
                                <version>1.1.1</version>
                        </dependency>
+                       <dependency>
+                               <groupId>javax.annotation</groupId>
+                               <artifactId>com.springsource.javax.annotation</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.persistence</groupId>
+                               <artifactId>com.springsource.javax.persistence</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.ws</groupId>
+                               <artifactId>com.springsource.javax.xml.ws</artifactId>
+                               <version>2.1.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>com.springsource.javax.xml.bind</artifactId>
+                               <version>2.1.7</version>
+                       </dependency>
 
                        <!-- Unit tests -->
                        <dependency>
@@ -392,6 +417,7 @@ limitations under the License.
                                <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
                                <version>1.5.3</version>
                        </dependency>
+
                        <!-- Spring -->
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -465,7 +491,49 @@ limitations under the License.
                        <dependency>
                                <groupId>org.springframework.osgi</groupId>
                                <artifactId>org.springframework.osgi.extender</artifactId>
-                               <version>1.1.2.B</version>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.core</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web.extender</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+
+                       <!-- AOP -->
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+                               <version>1.6.2.RELEASE</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+                               <version>1.6.2.RELEASE</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.attrs</artifactId>
+                               <version>2.2.0</version>
                        </dependency>
 
                        <!-- Ant -->
@@ -584,14 +652,6 @@ limitations under the License.
                                <artifactId>com.springsource.javax.activation</artifactId>
                                <version>1.1.1</version>
                        </dependency>
-
-                       <dependency>
-                               <groupId>org.aspectj</groupId>
-                               <artifactId>
-                                       com.springsource.org.aspectj.weaver
-                               </artifactId>
-                               <version>1.6.2.RELEASE</version>
-                       </dependency>
                        <dependency>
                                <groupId>com.lowagie.text</groupId>
                                <artifactId>
@@ -600,6 +660,12 @@ limitations under the License.
                                <version>2.0.8</version>
                        </dependency>
 
+                       <!-- Tomcat -->
+                       <dependency>
+                               <groupId>org.apache.catalina</groupId>
+                               <artifactId>com.springsource.org.apache.catalina</artifactId>
+                               <version>6.0.18</version>
+                       </dependency>
 
                        <!-- Maven -->
                        <dependency>
@@ -700,28 +766,34 @@ limitations under the License.
                        </dependency>
 
                        <!-- ActiveMQ -->
-                       <dependency>
-                               <groupId>org.apache.activemq</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>
+                               <version>${version.activemq}</version> </dependency>
+                       -->
                        <!--
                                <dependency> <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-pool</artifactId>
+                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
                                <version>${version.activemq}</version> </dependency> <dependency>
                                <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-optional</artifactId>
+                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
                                <version>${version.activemq}</version> </dependency>
                        -->
-                       <dependency>
-                               <groupId>org.apache.xbean</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.xbean</groupId>
                                <artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-                               <version>3.3.0</version>
+                               <version>3.3.0</version> </dependency>
+                       -->
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                               <version>5.2.0.argeo.1</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.camel</groupId>
+                               <artifactId>com.springsource.org.apache.camel</artifactId>
+                               <version>1.3.0</version>
                        </dependency>
 
                </dependencies>
@@ -745,7 +817,8 @@ limitations under the License.
                        <id>com.springsource.repository.bundles.release</id>
                        <name>
                                SpringSource Enterprise Bundle Repository - SpringSource
-                               Bundle Releases
+                               Bundle
+                               Releases
                        </name>
                        <url>
                                http://repository.springsource.com/maven/bundles/release
@@ -765,7 +838,8 @@ limitations under the License.
                        <id>com.springsource.repository.bundles.external</id>
                        <name>
                                SpringSource Enterprise Bundle Repository - External
-                               Bundle Releases
+                               Bundle
+                               Releases
                        </name>
                        <url>
                                http://repository.springsource.com/maven/bundles/external