Migration to distribution v1.3.0 completed

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

diff --git a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
index 4f4c150ddde79bf265f12cd7f77add01ff782ecc..700bd8a5c581f0e4ae948dccb48512af10a9f6b0 100644 (file)
--- a/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -70,7 +70,7 @@
                <dependency>
                        <groupId>org.argeo.tp.rap</groupId>
                        <artifactId>org.eclipse.rwt.widgets.upload</artifactId>
-                       <version>1.0.0.argeo002</version>
+                       <version>1.0.0.argeo003</version>
                </dependency>
                <!-- Needed by the bundle above -->
                <dependency>

diff --git a/pom.xml b/pom.xml
index a47ab6d6ad29fd0708215421470d9af198bc7795..82b6b76417808d86e0b2b0774c395874c4e4edd1 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>
@@ -410,6 +411,22 @@ limitations under the License.
                        </snapshots>
                </repository>
        </repositories>
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>argeo</id>
+                       <url>http://maven.argeo.org/argeo</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>fail</checksumPolicy>
+                       </snapshots>
+               </pluginRepository>
+       </pluginRepositories>
        <distributionManagement>
                <site>
                        <id>argeo-commons-site</id>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 9800b6ae905370e3b9434a812fd3cda892dcbe6d..f965af3e825b10a6d37c51aac94347f2cea460fb 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -48,61 +48,45 @@
 
                <!-- Xerces and Xalan -->
                <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xmlcommons</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.xalan</groupId>
-                       <artifactId>com.springsource.org.apache.xalan</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.xalan</artifactId>
                </dependency>
 
                <!-- Javax -->
                <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.annotation</artifactId>
                </dependency>
                <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>com.springsource.javax.mail</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.mail</artifactId>
                </dependency>
 
                <!-- Commons -->
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.vfs</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.vfs</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.exec</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.cli</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.dbcp</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.context.support</artifactId>
                </dependency>
                <!-- <dependency> -->
@@ -114,13 +98,13 @@
                <!-- <artifactId>org.springframework.jdbc</artifactId> -->
                <!-- </dependency> -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.jms</artifactId>
                </dependency>
 
                <!-- Spring OSGi -->
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
 
@@ -166,8 +150,8 @@
 
                <!-- Scheduling -->
                <dependency>
-                       <groupId>com.opensymphony.quartz</groupId>
-                       <artifactId>com.springsource.org.quartz</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.quartz</artifactId>
                </dependency>
 
                <!-- Security (LDAP) -->
@@ -198,11 +182,11 @@
 
                <!-- Web -->
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.web.extender</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.osgi.web</artifactId>
                </dependency>
                <dependency>
@@ -267,16 +251,16 @@
 
                <!-- DB drivers -->
                <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>com.springsource.org.h2</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.h2</artifactId>
                </dependency>
                <dependency>
-                       <groupId>com.mysql.jdbc</groupId>
-                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>com.mysql.jdbc</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.postgresql</groupId>
-                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.postgresql.jdbc3</artifactId>
                </dependency>
 
                <!-- Software development -->
@@ -438,4 +422,4 @@
                        </build>
                </profile>
        </profiles>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/org.argeo.security.equinox/pom.xml b/security/plugins/org.argeo.security.equinox/pom.xml
index 22f73c2f074a540dfe60222fe37639f69a0e797a..d8756a53131bd4d30a1a48d563b747213709282c 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/pom.xml
+++ b/security/plugins/org.argeo.security.equinox/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -41,12 +41,14 @@
 
                <!-- Eclipse -->
                <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.eclipse.equinox</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.eclipse.equinox.security</artifactId>
+                       <!-- FIXME until Equinox security is properly integrated -->
+                       <version>1.0.200</version>
                </dependency>
 
                <!-- Commons -->
@@ -63,8 +65,8 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/org.argeo.security.ui.admin/pom.xml b/security/plugins/org.argeo.security.ui.admin/pom.xml
index 1487b21e8601678e5c37515036090073d21159b9..444caf577049e36aada41a93f8ec6fe70943a246 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/pom.xml
+++ b/security/plugins/org.argeo.security.ui.admin/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -85,15 +85,15 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <!-- Others -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging
                        </artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 76fbabaf4756573c5dfc9c3ebfedb52f605ddbdf..fe01b82072d2fd6aed645ec7c9ddd0ef8831613e 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -47,8 +47,8 @@
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <!-- Argeo Security -->
@@ -75,4 +75,4 @@
                        <version>1.1.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/org.argeo.security.ui.rcp/pom.xml b/security/plugins/org.argeo.security.ui.rcp/pom.xml
index 68678dd73ebc7f974b1a684b54ddfced58c37729..d001143b497b7d80cd1154774c685663da549393 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rcp/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rcp/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -47,8 +47,8 @@
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <!-- Argeo Security -->
@@ -75,4 +75,4 @@
                        <version>1.1.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/org.argeo.security.ui/pom.xml b/security/plugins/org.argeo.security.ui/pom.xml
index f275c55438580728e1bdb0a1b8fc9cddecebd989..26fecab171845e286381df64e89d4f2a5e27fe26 100644 (file)
--- a/security/plugins/org.argeo.security.ui/pom.xml
+++ b/security/plugins/org.argeo.security.ui/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -77,15 +77,15 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <!-- Others -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/plugins/pom.xml b/security/plugins/pom.xml
index 5633b306048f79217daae11a05ce7b8378f0a31e..da7addc08c998447d2b2b2b9a061dd83fd0400cd 100644 (file)
--- a/security/plugins/pom.xml
+++ b/security/plugins/pom.xml
@@ -1,4 +1,4 @@
-<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</groupId>
@@ -84,10 +84,5 @@
                        <version>1.1.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
-                       <scope>test</scope>
-               </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.activemq/pom.xml b/security/runtime/org.argeo.security.activemq/pom.xml
index b360d333c569bcc1ed5034966d662a58a2552cf4..0a0a2c64b5cc5edb1fd2c0e72f26d32cacfc4381 100644 (file)
--- a/security/runtime/org.argeo.security.activemq/pom.xml
+++ b/security/runtime/org.argeo.security.activemq/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -50,39 +50,41 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.transaction</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
                <!-- JMS -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.activemq</artifactId>
+                       <!-- FIXME until duplicated ActiveMQ is removed -->
+                       <version>5.3.0.0001</version>
                </dependency>
                <dependency>
-                       <groupId>javax.jms</groupId>
-                       <artifactId>com.springsource.javax.jms</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jms</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.jms</artifactId>
                </dependency>
 
                <!-- TEST -->
                <dependency>
-                       <groupId>org.junit</groupId>
-                       <artifactId>com.springsource.junit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.jackrabbit/pom.xml b/security/runtime/org.argeo.security.jackrabbit/pom.xml
index 989cf10a5429c07e24df2f4e3f1af171d94bf5c1..e632d7d0968862dffea0b2f2916c11efba31ef38 100644 (file)
--- a/security/runtime/org.argeo.security.jackrabbit/pom.xml
+++ b/security/runtime/org.argeo.security.jackrabbit/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -28,7 +28,7 @@
 
                                <configuration>
                                        <instructions>
-                                               <Fragment-Host>org.argeo.dep.osgi.jackrabbit</Fragment-Host>
+                                               <Fragment-Host>org.apache.jackrabbit</Fragment-Host>
                                                <Export-Package>org.argeo.security.jackrabbit.*</Export-Package>
                                                <Import-Package>*,org.springframework.core</Import-Package>
                                        </instructions>
@@ -43,16 +43,16 @@
                        <version>1.1.1-SNAPSHOT</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.jackrabbit</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.security</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.security.core</artifactId>
                </dependency>
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.ldap/pom.xml b/security/runtime/org.argeo.security.ldap/pom.xml
index f4e28051b26365b8be21d9c43992bbf116341c6a..c9ff9fed982136912df100cf12a8e168456d7fdb 100644 (file)
--- a/security/runtime/org.argeo.security.ldap/pom.xml
+++ b/security/runtime/org.argeo.security.ldap/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -56,21 +56,21 @@
 
                <!-- JCR -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.jcr</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.jcr</artifactId>
                </dependency>
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.springframework.ldap</artifactId>
                </dependency>
 
                <!-- Logging -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>slf4j.org.apache.commons.logging</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.mvc/pom.xml b/security/runtime/org.argeo.security.mvc/pom.xml
index c07303a7378b33724d74ea680cde4c3c7ba26e27..d0358b8268c688b5224178a8ce74d2a0e2796467 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/pom.xml
+++ b/security/runtime/org.argeo.security.mvc/pom.xml
@@ -1,4 +1,4 @@
-<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.security</groupId>
@@ -54,19 +54,19 @@
 
                <!-- Spring -->
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.web.servlet</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
+                       <groupId>org.argeo.tp</groupId>
                        <artifactId>org.springframework.aop</artifactId>
                </dependency>
 
                <!-- J2EE -->
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>javax.servlet</artifactId>
                </dependency>
 
        </dependencies>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.activemq/pom.xml b/server/dep/org.argeo.server.dep.activemq/pom.xml
index 7e3dae827bc9ab4fc12708fd36f72dd9804c83b4..18f483d22738f1352d602ba118617755d1bbed74 100644 (file)
--- a/server/dep/org.argeo.server.dep.activemq/pom.xml
+++ b/server/dep/org.argeo.server.dep.activemq/pom.xml
@@ -26,6 +26,8 @@
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.activemq</artifactId>
+                       <!-- FIXME until duplicated ActiveMQ is removed -->
+                       <version>5.3.0.0001</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
@@ -55,13 +57,13 @@
                </dependency>
 
                <!-- Test OSGi -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.javax</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
-                       <type>pom</type>
-                       <scope>test</scope>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.commons.server</groupId> -->
+<!--                   <artifactId>org.argeo.server.dep.javax</artifactId> -->
+<!--                   <version>1.1.1-SNAPSHOT</version> -->
+<!--                   <type>pom</type> -->
+<!--                   <scope>test</scope> -->
+<!--           </dependency> -->
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>javax.servlet</artifactId>

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index dd911d6b3d087e9ea0f76bf4046d4ad7b14eca19..1e933aa052422018523790b1135cacccf35ae355 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -93,17 +93,19 @@
                </dependency>
 
                <!-- Test with Javax -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.javax</artifactId>
-                       <version>1.1.1-SNAPSHOT</version>
-                       <type>pom</type>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp</groupId>
                        <artifactId>org.apache.xmlcommons</artifactId>
                        <scope>test</scope>
                </dependency>
+               
+                                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.osgi</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>1.1.1-SNAPSHOT</version>
+                                       <scope>test</scope>
+                               </dependency>
+               
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
index 8cff6962c145307b8b13727c5dc92bcbb9c3d2b9..4326096f02862606beac2e02fc93c10adcc6e43b 100644 (file)
--- a/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
+++ b/server/modules/org.argeo.ext.jackrabbit.sybase/pom.xml
@@ -16,7 +16,7 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Fragment-Host>org.argeo.dep.osgi.jackrabbit</Fragment-Host>
+                                               <Fragment-Host>org.apache.jackrabbit</Fragment-Host>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/server/modules/org.argeo.ext.jdbm/pom.xml b/server/modules/org.argeo.ext.jdbm/pom.xml
index 782113a06ea9b201a42088c708c815bfbe5d227d..2d61366141fec6d266a0416bbf407eb134c773f3 100644 (file)
--- a/server/modules/org.argeo.ext.jdbm/pom.xml
+++ b/server/modules/org.argeo.ext.jdbm/pom.xml
@@ -16,7 +16,7 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Fragment-Host>com.springsource.jdbm</Fragment-Host>
+                                               <Fragment-Host>jdbm</Fragment-Host>
                                                <Import-Package>
                                                        org.apache.directory.server.core.partition.impl.btree.jdbm;resolution:=optional,
                                                        org.apache.directory.server.core.schema;resolution:=optional,

diff --git a/server/modules/org.argeo.server.catalina/pom.xml b/server/modules/org.argeo.server.catalina/pom.xml
index 5ee55b23385d8d73de70d3f6c01e48a474313388..2096395f886486c6b09d2fba2fecf682499ed7a8 100644 (file)
--- a/server/modules/org.argeo.server.catalina/pom.xml
+++ b/server/modules/org.argeo.server.catalina/pom.xml
@@ -15,7 +15,7 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
                                        <instructions>
-                                               <Fragment-Host>com.springsource.org.apache.catalina</Fragment-Host>
+                                               <Fragment-Host>org.apache.catalina</Fragment-Host>
                                                <!-- Hack for HTTP session deserialization in OSGi -->
                                                <Import-Package>
                                                        *,

diff --git a/server/runtime/org.argeo.server.core/pom.xml b/server/runtime/org.argeo.server.core/pom.xml
index 340af14d0dd07cc0d7e1dcbc4b4508029baabc1b..e751fe35d94da887b08a46eb3ecc7f9958bb8022 100644 (file)
--- a/server/runtime/org.argeo.server.core/pom.xml
+++ b/server/runtime/org.argeo.server.core/pom.xml
@@ -1,4 +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">
+<?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>
@@ -31,6 +33,7 @@
                                                <Export-Package>
                                                        org.argeo.server.*
                                                </Export-Package>
+                                               <Import-Package>javax.xml.transform.*;version="0.0.0",*</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/server/runtime/org.argeo.server.jcr.mvc/pom.xml b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
index 07368fc63f3a79f4fa349011252645c8143f3734..f8e7865d823ac3d083651b2d0853a2d07d9ff4b3 100644 (file)
--- a/server/runtime/org.argeo.server.jcr.mvc/pom.xml
+++ b/server/runtime/org.argeo.server.jcr.mvc/pom.xml
@@ -33,6 +33,10 @@
                                                </Export-Package>
                                                <Import-Package>
                                                        org.springframework.beans.factory,
+                                                       javax.xml.transform.*;version="0.0.0",
+                                                       javax.xml.parsers.*;version="0.0.0",
+                                                       org.w3c.dom.*;version="0.0.0",
+                                                       org.xml.sax.*;version="0.0.0",
                                                        *
                                                </Import-Package>
                                        </instructions>