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/06/30 19:30:12 UTC
[1/2] git commit: CLEREZZA-927: using relased version of
frameworkfragment
Repository: clerezza
Updated Branches:
refs/heads/release-201407 becb28664 -> c71dd8212
CLEREZZA-927: using relased version of frameworkfragment
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/55a6e4b9
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/55a6e4b9
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/55a6e4b9
Branch: refs/heads/release-201407
Commit: 55a6e4b9e8753b789b5eace025f8b6364f8e325a
Parents: 3c8041c
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon Jun 30 19:17:59 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon Jun 30 19:17:59 2014 +0200
----------------------------------------------------------------------
provisioning/jaxrs-whiteboard/pom.xml | 17 ++++++++---------
provisioning/rdf/pom.xml | 11 ++++++++---
provisioning/shell/pom.xml | 2 +-
3 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/55a6e4b9/provisioning/jaxrs-whiteboard/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/jaxrs-whiteboard/pom.xml b/provisioning/jaxrs-whiteboard/pom.xml
index af6dbaf..5cf2089 100644
--- a/provisioning/jaxrs-whiteboard/pom.xml
+++ b/provisioning/jaxrs-whiteboard/pom.xml
@@ -42,7 +42,6 @@
<dependencies>
- <!-- this is currently in the stanbol ng branch -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
@@ -130,22 +129,22 @@
<dependency>
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
<artifactId>jersey-guava</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>14.0.1</version>
- </dependency>
- <dependency> <!-- for xml.bind.annotation -->
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>17.0</version>
+ </dependency> -->
+ <dependency> <!-- for xml.bind.annotation, javax.xml.datatype -->
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.fragment.xml</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/55a6e4b9/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index dd943ff..21de3c6 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -67,13 +67,18 @@
<groupId>com.google.guava</groupId>
<version>14.0</version>
</dependency>
-
+
+ <!-- needed by org.wymiwyg.commons, required by rdf.rdfa -->
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.fragment.activation</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<!-- providing packages like javax.xml.stream needed by tdb -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
- <version>0.11.0</version>
- <scope>provided</scope>
+ <version>0.12.0</version>
</dependency>
<!-- clerezza bundles -->
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/55a6e4b9/provisioning/shell/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/shell/pom.xml b/provisioning/shell/pom.xml
index c795350..160bc75 100644
--- a/provisioning/shell/pom.xml
+++ b/provisioning/shell/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0</version>
<scope>provided</scope>
</dependency>
[2/2] git commit: Merge branch 'master' of
/home/reto/projects/apache/clerezza into release-201407
Posted by re...@apache.org.
Merge branch 'master' of /home/reto/projects/apache/clerezza into release-201407
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/c71dd821
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/c71dd821
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/c71dd821
Branch: refs/heads/release-201407
Commit: c71dd82122a426db44d849512d9788775b9830c2
Parents: becb286 55a6e4b
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon Jun 30 19:19:11 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon Jun 30 19:19:11 2014 +0200
----------------------------------------------------------------------
provisioning/jaxrs-whiteboard/pom.xml | 17 ++++++++---------
provisioning/rdf/pom.xml | 11 ++++++++---
provisioning/shell/pom.xml | 2 +-
3 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/c71dd821/provisioning/shell/pom.xml
----------------------------------------------------------------------