projects / lgpl / argeo-commons.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0986495)
Make use of Equinox more consistent
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 31 Jul 2014 11:27:37 +0000 (11:27 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 31 Jul 2014 11:27:37 +0000 (11:27 +0000)
Centralize RAP versions and dependency management

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

base/dep/org.argeo.eclipse.dep.rap/pom.xml patch | blob | history
base/runtime/org.argeo.osgi.boot/pom.xml patch | blob | history
pom.xml patch | blob | history
server/runtime/org.argeo.server.jackrabbit/pom.xml patch | blob | history
server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java patch | blob | history

diff --git a/base/dep/org.argeo.eclipse.dep.rap/pom.xml b/base/dep/org.argeo.eclipse.dep.rap/pom.xml
index 00522d96f75370672689b1adac0bd1538369c9f4..01498bbdd0b15156983c0a6c4a05eacaf80cd465 100644 (file)
--- a/base/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/base/dep/org.argeo.eclipse.dep.rap/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>
@@ -9,10 +10,6 @@
        </parent>
        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
        <name>Commons Eclipse RAP Dependencies</name>
-       <properties>
-               <version.rap>2.2.0-R-20131204-0942</version.rap>
-               <version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
-       </properties>
        <build>
                <plugins>
                        <plugin>
@@ -32,6 +29,13 @@
                        <artifactId>binaries</artifactId>
                        <version>${version.rap.addons}</version>
                        <type>pom</type>
+                       <exclusions>
+                               <exclusion>
+                                       <!-- TODO remove OSGi runtime from addons -->
+                                       <groupId>org.argeo.tp.rap.addons</groupId>
+                                       <artifactId>org.eclipse.osgi</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
                <dependency>
@@ -146,37 +150,14 @@
                        <artifactId>org.eclipse.equinox.security</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.argeo.commons.base</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.8-SNAPSHOT</version>
-               </dependency>
+               <!-- 2014-07-31 mbaudier : Removed, since it feels wrong to put an Argeo 
+                       dependency here -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons.base</groupId> -->
+               <!-- <artifactId>org.argeo.osgi.boot</artifactId> -->
+               <!-- <version>2.1.8-SNAPSHOT</version> -->
+               <!-- </dependency> -->
        </dependencies>
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.argeo-distribution}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.addons</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap.addons}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.tp.rap.platform</groupId>
-                               <artifactId>binaries</artifactId>
-                               <version>${version.rap}</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
        <profiles>
                <profile>
                        <id>check-osgi</id>
@@ -243,7 +224,8 @@
                                                                <configuration>
                                                                        <target>
                                                                                <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
diff --git a/base/runtime/org.argeo.osgi.boot/pom.xml b/base/runtime/org.argeo.osgi.boot/pom.xml
index 8117d1873deab4e9446594acc2523fc9f2e980c1..8d270aa03d63be2af3f8dcd0539dcaa99bea124b 100644 (file)
--- a/base/runtime/org.argeo.osgi.boot/pom.xml
+++ b/base/runtime/org.argeo.osgi.boot/pom.xml
@@ -36,11 +36,9 @@
        </build>
        <dependencies>
                <dependency>
-                       <!-- 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>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
-                       <version>3.9.0.v20130529-1710</version>
+                       <scope>provided</scope>
                </dependency>
 
                <!-- TEST -->
diff --git a/pom.xml b/pom.xml
index e8542ded3bfec68de8615d66c62deea1e8b49b3d..7c89b004bbcdaa99606e3132e9c1d8916f026add 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>
@@ -8,10 +9,12 @@
        <description>Generic layers integrating free / open source technologies in order to quickly develop custom enterprise systems: security, JCR, user interface, monitoring</description>
        <packaging>pom</packaging>
        <properties>
+               <version.argeo-commons>2.1.8-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>1.4.0</version.argeo-distribution>
-               <version.argeo-commons>2.1.8-SNAPSHOT</version.argeo-commons>
+               <version.rap>2.2.0-R-20131204-0942</version.rap>
+               <version.rap.addons>0.2.0.20131212-1229</version.rap.addons>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -482,6 +485,28 @@ limitations under the License.
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <!-- Eclipse RAP -->
+                       <dependency>
+                               <groupId>org.argeo.tp.rap</groupId>
+                               <artifactId>binaries</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp.rap.addons</groupId>
+                               <artifactId>binaries</artifactId>
+                               <version>${version.rap.addons}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.tp.rap.platform</groupId>
+                               <artifactId>binaries</artifactId>
+                               <version>${version.rap}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
diff --git a/server/runtime/org.argeo.server.jackrabbit/pom.xml b/server/runtime/org.argeo.server.jackrabbit/pom.xml
index bef0fe3fd6d2cc76acd201c2a727463dbedc6b02..23fae6e0e6c5769e699b4a39a4d60eb67091a696 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/pom.xml
+++ b/server/runtime/org.argeo.server.jackrabbit/pom.xml
@@ -66,7 +66,7 @@
 
                <!-- OSGi -->
                <dependency>
-                       <groupId>org.argeo.tp</groupId>
+                       <groupId>org.argeo.tp.rap.platform</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                        <scope>provided</scope>
                </dependency>
diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java
index 34d8da0e35d5af6c2c330281ffe0acac08e25206..b28699e60c029fdf35e2cc81e4d421627789e2dd 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/OsgiJackrabbitRepositoryFactory.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.jackrabbit;
 
+import java.util.Hashtable;
 import java.util.Properties;
 
 import javax.jcr.Repository;
@@ -27,16 +28,15 @@ import org.osgi.framework.BundleContext;
  */
 public class OsgiJackrabbitRepositoryFactory extends
                JackrabbitRepositoryFactory {
-//     private final static Log log = LogFactory
-//                     .getLog(OsgiJackrabbitRepositoryFactory.class);
        private BundleContext bundleContext;
 
        protected void publish(String alias, Repository repository,
                        Properties properties) {
                if (bundleContext != null) {
                        // do not modify reference
-                       Properties props = new Properties(properties);
-                       props.setProperty(JCR_REPOSITORY_ALIAS, alias);
+                       Hashtable<String, String> props = new Hashtable<String, String>();
+                       props.putAll(props);
+                       props.put(JCR_REPOSITORY_ALIAS, alias);
                        bundleContext.registerService(Repository.class.getName(),
                                        repository, props);
                }
Argeo Commons - Lightweight integration framework in pure Java/OSGi