Start migrating to an OSGi server

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index f6092a1ff4d055243fbdbec221fb5a470175ccfe..f90ea744d27403d230d80c154d358d8872daddf5 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -12,6 +12,7 @@
        <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>
@@ -48,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>
@@ -293,7 +294,7 @@ limitations under the License.
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.execution</artifactId>
+                               <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
                        </dependency>
                        <dependency>
@@ -353,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>
@@ -396,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>
@@ -469,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 -->
@@ -588,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>
@@ -604,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>
@@ -749,7 +811,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
@@ -769,7 +832,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