Move to the root the bundles which will be part of v1.4 and v2.2

[lgpl/argeo-commons.git] / server / dep / org.argeo.server.dep.tomcat / pom.xml

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 2f74a5b9b0826672070d02ed723c3cfd1d339f66..6f0ae7e84d6a59cf6476a55e2e9b218a80800d41 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.argeo.commons.server</groupId>
-               <version>1.1.7</version>
+               <groupId>org.argeo.commons</groupId>
+               <version>2.1.12-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -12,23 +13,23 @@
        <dependencies>
                <!-- Commons Dep -->
                <dependency>
-                       <groupId>org.argeo.commons.base</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>1.1.7</version>
+                       <version>2.1.12-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
                <!-- Modules -->
                <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
+                       <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.server.catalina</artifactId>
-                       <version>1.1.7</version>
+                       <version>2.1.12-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.server.catalina.start</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.commons.server</groupId> -->
-<!--                   <artifactId>org.argeo.server.tomcat</artifactId> -->
-<!--                   <version>0.3.1-SNAPSHOT</version> -->
-<!--           </dependency> -->
 
                <!-- JEE -->
                <dependency>
@@ -71,10 +72,6 @@
                </dependency>
 
                <!-- Tomcat -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.coyote</artifactId>
@@ -98,14 +95,14 @@
                        <artifactId>org.apache.xmlcommons</artifactId>
                        <scope>test</scope>
                </dependency>
-               
-                                               <!-- OSGi test -->
-                               <dependency>
-                                       <groupId>org.argeo.commons.base</groupId>
-                                       <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>1.1.7</version>
-                                       <scope>test</scope>
-                               </dependency>
-               
+
+               <!-- OSGi test -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>2.1.12-SNAPSHOT</version>
+                       <scope>test</scope>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file