fix commons maven build

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

diff --git a/base/runtime/org.argeo.osgi.boot/pom.xml b/base/runtime/org.argeo.osgi.boot/pom.xml
index ab8aa101721775d779e6f7fc7fa6243642961f11..cdb5599bb102501b5f4a12e27628fee4f1fb19ef 100644 (file)
--- a/base/runtime/org.argeo.osgi.boot/pom.xml
+++ b/base/runtime/org.argeo.osgi.boot/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.base</groupId>
@@ -36,9 +37,10 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.tp.rap.platform</groupId>
+                       <!-- Temporary fix the OSGI boot with Rap 2.2+ : version has been uploaded 
+                               to 3.9.1+ that breaks JCR <version>3.9.0.v20130305-2200</version> -->
+                       <groupId>org.argeo.tp.rap.addons</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
-                       <!-- <version>3.9.0.v20130305-2200</version>-->
                        <version>3.9.0.v20130529-1710</version>
                </dependency>
 

diff --git a/pom.xml b/pom.xml
index 06920b2b0308643f98a11655d3e32c4ea40390e6..e6403942e4fd9db536de625bfafff7bb5e6930ae 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>
@@ -494,24 +495,18 @@ limitations under the License.
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
-               <!-- <repository>
-                       <id>argeo-tp-rap</id>
-                       <url>http://repo.argeo.org/data/public/java/eclipse-rap-2.1</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-               </repository> -->
                <repository>
                        <id>argeo-tp-rap</id>
-                       <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url>
+                       <url>https://forge.argeo.org/data/public/java/eclipse-rap-2.2</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
                </repository>
+               <!-- <repository> <id>argeo-tp-rap</id> <url>http://localhost:9070/data/public/java/eclipse-rap-2.2</url> 
+                       <releases> <enabled>true</enabled> <updatePolicy>daily</updatePolicy> <checksumPolicy>warn</checksumPolicy> 
+                       </releases> </repository> -->
        </repositories>
        <pluginRepositories>
                <pluginRepository>