You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2014/03/02 18:46:11 UTC

git commit: CLEREZZA-815: updated dependency versions. Adapted to changed platform.config dependencies

Repository: clerezza
Updated Branches:
  refs/heads/master a40724e70 -> 3ef365d7d


CLEREZZA-815: updated dependency versions. Adapted to changed platform.config dependencies


Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/3ef365d7
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/3ef365d7
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/3ef365d7

Branch: refs/heads/master
Commit: 3ef365d7dff7828455284339b5892c02047a93cf
Parents: a40724e
Author: retobg <re...@apache.org>
Authored: Sun Mar 2 18:45:55 2014 +0100
Committer: retobg <re...@apache.org>
Committed: Sun Mar 2 18:45:55 2014 +0100

----------------------------------------------------------------------
 provisioning/felixosgi/pom.xml                    | 14 +++++++-------
 .../launchers/shell-launcher/nbactions.xml        | 18 ++++++++++++++++++
 provisioning/rdf/pom.xml                          |  4 ++--
 provisioning/shell/pom.xml                        | 13 ++++++++++++-
 4 files changed, 39 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/3ef365d7/provisioning/felixosgi/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/felixosgi/pom.xml b/provisioning/felixosgi/pom.xml
index 00520cd..6f6642d 100644
--- a/provisioning/felixosgi/pom.xml
+++ b/provisioning/felixosgi/pom.xml
@@ -56,32 +56,32 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.6.2</version>
+            <version>1.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>1.2.8</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.metatype</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.10</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.eventadmin</artifactId>
-            <version>1.2.14</version>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -95,7 +95,7 @@
         <dependency> 
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.log</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/3ef365d7/provisioning/launchers/shell-launcher/nbactions.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/shell-launcher/nbactions.xml b/provisioning/launchers/shell-launcher/nbactions.xml
index 101fb77..6ffa708 100644
--- a/provisioning/launchers/shell-launcher/nbactions.xml
+++ b/provisioning/launchers/shell-launcher/nbactions.xml
@@ -37,6 +37,24 @@
     </properties>
   </action>
   <action>
+        <actionName>CUSTOM-run-online</actionName>
+        <displayName>Run (online mode)</displayName>
+        <goals>
+            <goal>antrun:run</goal>
+            <goal>clean</goal>
+            <goal>package</goal>
+            <goal>antrun:run</goal>
+        </goals>
+  </action>
+  <action>
+        <actionName>CUSTOM-resume-run</actionName>
+        <displayName>Resume run</displayName>
+        <goals>
+            <goal>antrun:run</goal>
+            <goal>-o</goal>
+        </goals>
+  </action>
+  <action>
         <actionName>CUSTOM-resume-debug</actionName>
         <displayName>Resume Debug</displayName>
         <goals>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/3ef365d7/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index 4c21c50..c9b3afd 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -153,8 +153,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
-            <artifactId>rdf.jena.parser</artifactId>
-            <version>0.12-SNAPSHOT</version>
+            <artifactId>rdf.file.storage</artifactId>
+            <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza.ext</groupId>            

http://git-wip-us.apache.org/repos/asf/clerezza/blob/3ef365d7/provisioning/shell/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/shell/pom.xml b/provisioning/shell/pom.xml
index fe7aabe..9f397c8 100644
--- a/provisioning/shell/pom.xml
+++ b/provisioning/shell/pom.xml
@@ -163,17 +163,28 @@
             <version>0.14-SNAPSHOT</version>
         </dependency>
         
-        <dependency> <!--required for tcprovider, which is needed for the systemgraph to be available to stanbol.security.core -->
+        <dependency> <!--required by platform.config -->
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.simple.storage</artifactId>
             <version>0.8-SNAPSHOT</version>
         </dependency>
         
+        <dependency> <!--required by platform.config -->
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>rdf.file.storage</artifactId>
+            <version>0.4-SNAPSHOT</version>
+        </dependency>
+        
         <dependency><!-- system config rquires an rdf/xml parsing proivder -->
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.jena.parser</artifactId>
             <version>0.12-SNAPSHOT</version>
         </dependency>
+        <dependency><!-- system config rquires an n-triples parsing proivder -->
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>rdf.jena.serializer</artifactId>
+            <version>0.11-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.jena.facade</artifactId>