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/08/06 22:27:10 UTC

[1/2] git commit: CLEREZZA-941: using released version of felix.main and security

Repository: clerezza
Updated Branches:
  refs/heads/master fe1f76b62 -> a7b101812


CLEREZZA-941: using released version of felix.main and security


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

Branch: refs/heads/master
Commit: c79a89e3756cdc2266dbdb64ea73e1364e8a0620
Parents: 7825334
Author: Reto Gmür <re...@apache.org>
Authored: Wed Aug 6 22:26:14 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Wed Aug 6 22:26:14 2014 +0200

----------------------------------------------------------------------
 .../platform.launcher.storageless/pom.xml                        | 4 ++--
 platform.launcher.storageless.parent/pom.xml                     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/c79a89e3/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml b/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
index f60829e..3ca6aa1 100644
--- a/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
+++ b/platform.launcher.storageless.parent/platform.launcher.storageless/pom.xml
@@ -251,7 +251,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
             <scope>provided</scope>
-            <version>4.3.0-SNAPSHOT</version>
+            <version>4.4.1</version>
         </dependency>
         <!-- framework bundles -->
         <dependency>
@@ -398,7 +398,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework.security</artifactId>
             <scope>provided</scope>
-            <version>2.1.0-SNAPSHOT</version>
+            <version>2.4.0</version>
         </dependency>
         <!-- support for parameterhandling, etc -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/c79a89e3/platform.launcher.storageless.parent/pom.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.storageless.parent/pom.xml b/platform.launcher.storageless.parent/pom.xml
index e475281..04e3a62 100644
--- a/platform.launcher.storageless.parent/pom.xml
+++ b/platform.launcher.storageless.parent/pom.xml
@@ -62,11 +62,13 @@
           <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
 	  <version>${stanbol.version}</version>
 	</dependency>
+    <!-- 0.12 version is incomaptible with 1.0.0 version of commons.security, so diabling till stanbol 1.0.0 is released
 	<dependency>
           <groupId>org.apache.stanbol</groupId>
           <artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
 	  <version>${stanbol.version}</version>
 	</dependency>
+    -->
 	<dependency>
 	  <groupId>org.apache.stanbol</groupId>
 	  <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza

Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza


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

Branch: refs/heads/master
Commit: a7b1018128ec63bd61c54a601d972a1c76937a68
Parents: c79a89e fe1f76b
Author: Reto Gmür <re...@apache.org>
Authored: Wed Aug 6 22:26:48 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Wed Aug 6 22:26:48 2014 +0200

----------------------------------------------------------------------
 .../rdf/virtuoso/storage/RdfIOTest.java         | 36 ++++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------