Adapt to changes in Argeo TP

git-svn-id: https://svn.argeo.org/commons/trunk@8949 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 3c5bafc9aa76b939753612e26148288931d56ded..7d86629814bc4ca07f2cd04ced2fd2cd5e2f66f7 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -25,56 +25,56 @@
                        <groupId>org.argeo.tp.apache.ant</groupId>
                        <artifactId>org.apache.ant.launch</artifactId>
                </dependency>
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
-<!--                   <artifactId>biz.aQute.bnd</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
-<!--                   <artifactId>org.junit</artifactId> -->
-<!--           </dependency> -->
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>biz.aQute.bnd</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>org.junit</artifactId>
+               </dependency>
 
                <!-- SLC -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
-<!--                   <artifactId>org.dbunit</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.api</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.spi</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.util</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.impl</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <groupId>org.argeo.tp.aether</groupId> -->
-<!--                   <artifactId>org.eclipse.aether.transport.file</artifactId> -->
-<!--           </dependency> -->
-<!--           <dependency> -->
-<!--                   <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> -->
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>org.dbunit</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.spi</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.util</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.impl</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.connector.basic</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.transport.classpath</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.aether</groupId>
+                       <artifactId>org.eclipse.aether.transport.file</artifactId>
+               </dependency>
+               <dependency>
+                       <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>
        </dependencies>
 
        <profiles>

diff --git a/pom.xml b/pom.xml
index f0b5622814722d7a617f8f6eb23c85e91aff488b..10a3d5f8ea5f4cefed98285a29253b0ef9e5a26c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -10,7 +11,7 @@
                <version.argeo-commons>2.1.40-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.12</version.argeo-distribution>
+               <version.argeo-distribution>2.1.14</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>
@@ -414,14 +415,24 @@ limitations under the License.
        </dependencyManagement>
        <repositories>
                <repository>
-                       <id>argeo-tp</id>
-                       <url>http://forge.argeo.org/data/public/java/argeo-tp-2.1/</url>
+                       <id>argeo</id>
+                       <url>http://forge.argeo.org/data/public/java/argeo-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <repository>
+                       <id>central</id>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <pluginRepositories>
                <pluginRepository>
@@ -446,7 +457,7 @@ limitations under the License.
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://repo.argeo.org/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                       <url>dav:https://forge.argeo.org/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
        </distributionManagement>
@@ -455,7 +466,7 @@ limitations under the License.
                        <id>localrepo</id>
                        <repositories>
                                <repository>
-                                       <id>argeo-tp</id>
+                                       <id>argeo</id>
                                        <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
@@ -463,15 +474,6 @@ limitations under the License.
                                                <checksumPolicy>warn</checksumPolicy>
                                        </releases>
                                </repository>
-<!--                           <repository> -->
-<!--                                   <id>staging</id> -->
-<!--                                   <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url> -->
-<!--                                   <releases> -->
-<!--                                           <enabled>true</enabled> -->
-<!--                                           <updatePolicy>daily</updatePolicy> -->
-<!--                                           <checksumPolicy>warn</checksumPolicy> -->
-<!--                                   </releases> -->
-<!--                           </repository> -->
                        </repositories>
                        <distributionManagement>
                                <repository>
@@ -498,8 +500,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -524,8 +528,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>