Prepare repositories merge

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

diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 2dab1f2605d9063941de126f9658724def3c1592..0a5040be0ff96f1b2012a94a17479234cc9cb7eb 100644 (file)
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -77,19 +77,10 @@
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>org.quartz-scheduler.quartz.jobs</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>biz.aQute.bnd</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.javax</groupId>
                        <artifactId>javax.mail</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>org.junit</artifactId>
-               </dependency>
-
 
                <!-- RAP Workbench -->
                <dependency>

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 700f66bb308b92f62cc67ba45e638ba36ecf42fc..88bc277a8a5ba8cb0574bdfc8180203b9ae751eb 100644 (file)
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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</groupId>
@@ -15,7 +16,7 @@
                        <artifactId>org.argeo.dep.cms.platform</artifactId>
                        <version>2.1.39-SNAPSHOT</version>
                </dependency>
-               
+
                <!-- ALM Third Parties -->
                <dependency>
                        <groupId>org.argeo.tp.apache.ant</groupId>
@@ -25,15 +26,56 @@
                        <groupId>org.argeo.tp.apache.ant</groupId>
                        <artifactId>org.apache.ant.launch</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>biz.aQute.bnd</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.misc</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> -->
        </dependencies>
 
        <profiles>

diff --git a/pom.xml b/pom.xml
index 6d6a3020f083fd841d3453093054067052562fb5..9bfec3acb65df0f2ded53b71403f579edd1a5a3e 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>
@@ -455,23 +456,32 @@ limitations under the License.
                        <id>localrepo</id>
                        <repositories>
                                <repository>
-                                       <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <id>argeo-tp</id>
+                                       <url>http://localhost:7070/data/public/java/argeo-${developmentCycle.argeo-commons}</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>
                                                <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>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/java/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7070/data/files/java/argeo-${developmentCycle.argeo-commons}</url>
                                </repository>
                                <site>
                                        <id>staging</id>
-                                       <url>dav:http://localhost:7070/data/files/docs/argeo-commons-${developmentCycle.argeo-commons}</url>
+                                       <url>dav:http://localhost:7070/data/files/docs/argeo-${developmentCycle.argeo-commons}</url>
                                </site>
                        </distributionManagement>
                </profile>
@@ -489,8 +499,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>
@@ -515,8 +527,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>