Adapt to Argeo TP v2.1.18

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index c0faa771ba80b68fa50ef05feb74d5aed9698b0a..42f3d093e7f0732fa35b7bb02827d98d3e79d7c3 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -60,6 +60,14 @@
                        <groupId>org.argeo.tp.bouncycastle</groupId>
                        <artifactId>bcpkix</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
                        <artifactId>org.apache.commons.io</artifactId>
@@ -152,6 +160,10 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.metatype</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.felix</groupId>
+                       <artifactId>org.apache.felix.scr</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.gogo.runtime</artifactId>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 3099f6b80627bca5ed360accc22383bf7b938a29..887d6ac0ff5c0fbde102d1d121cd4cf8a9171409 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -66,27 +66,52 @@
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>bitronix.tm</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.joda.time</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.joda.time</artifactId> -->
+<!--           </dependency> -->
 
-               <!-- Third Parties -->
+               <!-- Database drivers -->
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>org.h2</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.w3c.css.sac</artifactId>
+                       <artifactId>org.postgresql.jdbc42</artifactId>
                </dependency>
+               <!-- Third Parties -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.w3c.css.sac</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>com.steadystate.css</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.steadystate.css</artifactId>
+                       <artifactId>com.google.gson</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.xmlgraphics.commons</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.google.gson</artifactId>
+                       <artifactId>org.w3c.dom.svg</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.batik.i18n</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.batik.util</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.batik.css</artifactId>
                </dependency>
 
                <!-- Jackrabbit -->

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 9410cd67f738eeb22a23e62801bdb6729a900943..d94f372dfb9ecc7b6a81dc38b699bf86b3f48dd5 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -55,14 +55,14 @@
                        <groupId>org.argeo.tp.apache.ant</groupId>
                        <artifactId>org.apache.ant.launch</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.quartz-scheduler.quartz</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.quartz-scheduler.quartz</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.quartz-scheduler.quartz.jobs</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.javax</groupId>
                        <artifactId>javax.mail</artifactId>

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 0d58eb27e666f8176a07bd3a82fcaf9f05781306..04c8ffc097c2baf466270fb6ef6d4a97c94e4a08 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -72,20 +72,27 @@
                        <groupId>org.argeo.tp.sdk</groupId>
                        <artifactId>org.redline-rpm</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.sdk</groupId>
-                       <artifactId>org.tmatesoft.svnkit</artifactId>
-               </dependency>
-               
-               <!-- Database drivers -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>org.tmatesoft.svnkit</artifactId> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.postgresql.postgresql</artifactId>
+                       <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.h2</artifactId>
+                       <artifactId>org.eclipse.jgit</artifactId>
                </dependency>
+               
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.postgresql.postgresql</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.misc</groupId> -->
+<!--                   <artifactId>org.h2</artifactId> -->
+<!--           </dependency> -->
        </dependencies>
 
        <profiles>

diff --git a/pom.xml b/pom.xml
index 6a3a04864aa1d3a3a5a7d836fbdc7e70ba8ca012..1d593c096afe4f375622057fb309dd3e543ee552 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
                <version.argeo-commons>2.1.70-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.17</version.argeo-distribution>
+               <version.argeo-distribution>2.1.18</version.argeo-distribution>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/7/x86_64</argeo.rpm.stagingRepository>
@@ -470,7 +470,7 @@ limitations under the License.
                        <repositories>
                                <repository>
                                        <id>argeo</id>
-                                       <url>http://localhost:7080/data/java/argeo-${developmentCycle.argeo-commons}</url>
+                                       <url>http://localhost:7080/data/java/argeo-2.1</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>