Adapt to changes in Argeo TP

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

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index d7ebada4e830e8e1bb98d952f95c0e6b41a2b573..1f36f1ae0f10fd82573a77ba200ab79151a59d1a 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -115,63 +115,63 @@
                </dependency>
 
                <!-- Third parties (extras) -->
-               <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.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.extras</groupId>
-                       <artifactId>net.sf.jxl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>org.postgresql.postgresql</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>org.dbunit</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.spi</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.util</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.impl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.connector.basic</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.transport.classpath</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras.eclipse</groupId>
-                       <artifactId>org.eclipse.aether.transport.file</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>org.redline-rpm</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>org.tmatesoft.svnkit</artifactId>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras</groupId> -->
+<!--                   <artifactId>net.sf.jxl</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras</groupId> -->
+<!--                   <artifactId>org.postgresql.postgresql</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras</groupId> -->
+<!--                   <artifactId>org.dbunit</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.api</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.spi</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.util</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.impl</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras.eclipse</groupId> -->
+<!--                   <artifactId>org.eclipse.aether.transport.file</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras</groupId> -->
+<!--                   <artifactId>org.redline-rpm</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.extras</groupId> -->
+<!--                   <artifactId>org.tmatesoft.svnkit</artifactId> -->
+<!--           </dependency> -->
        </dependencies>
        <profiles>
                <profile>

diff --git a/pom.xml b/pom.xml
index bef29ce63a5490c4be294e1a475a9f79da02f542..5131435a4e1cf9d63205625613a1a09afab03d73 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.1.39</version>
+               <version>2.1.40-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>
@@ -14,8 +14,6 @@
                <developmentCycle.slc>2.1</developmentCycle.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
                <version.slc>2.1.3-SNAPSHOT</version.slc>
-               <!-- Libraries versions -->
-               <version.argeo-tp-extras>2.1.7</version.argeo-tp-extras>
        </properties>
        <modules>
                <!-- Runtime -->
@@ -119,56 +117,6 @@ limitations under the License.
                        </plugin>
                </plugins>
        </build>
-       <repositories>
-               <repository>
-                       <id>argeo-commons</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-commons-2.1</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-               <repository>
-                       <id>argeo-tp-extras</id>
-                       <url>http://forge.argeo.org/data/public/java/argeo-tp-extras-2.1</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository>
-       </repositories>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.tp.extras</groupId>
-                       <artifactId>argeo-tp-extras</artifactId>
-                       <version>${version.argeo-tp-extras}</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp.extras</groupId>
-                               <artifactId>argeo-tp-extras</artifactId>
-                               <version>${version.argeo-tp-extras}</version>
-                               <scope>import</scope>
-                               <type>pom</type>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <distributionManagement>
-               <repository>
-                       <id>staging</id>
-                       <url>dav:https://repo.argeo.org/data/files/java/argeo-slc-${developmentCycle.slc}</url>
-                       <uniqueVersion>false</uniqueVersion>
-               </repository>
-               <site>
-                       <id>site</id>
-                       <url>dav:https://repo.argeo.org/data/files/docs/argeo-slc-${developmentCycle.slc}</url>
-               </site>
-       </distributionManagement>
        <profiles>
                <profile>
                        <id>localrepo</id>