You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/03/18 14:46:16 UTC
[2/5] git commit: moved zookeeper dependency into separate profile
moved zookeeper dependency into separate profile
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0ae97e74
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0ae97e74
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0ae97e74
Branch: refs/heads/develop
Commit: 0ae97e74fffb227306232287484bc7f01bed4754
Parents: 5b30dae
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 13:45:23 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 13:45:23 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 17 ++++++++++-------
parent/pom.xml | 2 ++
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0ae97e74/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 1364170..f75563d 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -398,6 +398,16 @@
</dependencies>
</profile>
+ <profile>
+ <id>zookeeper</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-zookeeper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
<profile>
<id>cleanall</id>
@@ -481,13 +491,6 @@
<artifactId>marmotta-security</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Optional
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-zookeeper</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
<!-- JavaEE / Servlet / CDI Environment -->
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0ae97e74/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 82e1ee3..55336d2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -53,6 +53,8 @@
<resteasy.version>3.0.6.Final</resteasy.version>
<jackson.version>2.2.3</jackson.version>
<titan.version>0.4.2</titan.version>
+
+ <rebel.root>${project.basedir}</rebel.root>
</properties>
<prerequisites>