You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/02/19 22:10:20 UTC
git commit: fixed webapp pom (hopefully also fixes the reactor)
Updated Branches:
refs/heads/master b55426566 -> 9760ed6c3
fixed webapp pom (hopefully also fixes the reactor)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/9760ed6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/9760ed6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/9760ed6c
Branch: refs/heads/master
Commit: 9760ed6c3cf8ce1c2e344958146bc8b5ea0a109c
Parents: b554265
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Feb 19 22:10:10 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Feb 19 22:10:10 2013 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 35 ++++++++-------
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 16 +++---
.../target/maven-archiver/pom.properties | 4 +-
.../target/maven-archiver/pom.properties | 4 +-
5 files changed, 31 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9760ed6c/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index fed29f4..fd3a1d0 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -23,24 +23,25 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
<artifactId>marmotta-webapp</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.0-incubating-SNAPSHOT</version>
<packaging>war</packaging>
- <name>LMF Web Application</name>
+ <name>Marmotta Web Application</name>
<description>Web Application bundle (WAR file) containing the complete Linked Media Framework</description>
<properties>
<!-- these are used for the goals tomcat6/7:run or jetty:run -->
- <lmf.home>/tmp/lmf</lmf.home>
+ <lmf.home>/tmp/marmotta</lmf.home>
<lmf.context>/</lmf.context>
<lmf.port>8080</lmf.port>
</properties>
<build>
- <finalName>LMF</finalName>
+ <finalName>Marmotta</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -93,8 +94,8 @@
<systemProperties>
<kiwi.home>${lmf.home}</kiwi.home>
</systemProperties>
-<!-- <contextReloadable>true</contextReloadable> -->
-<!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
+ <!-- <contextReloadable>true</contextReloadable> -->
+ <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
</configuration>
</plugin>
<plugin>
@@ -117,7 +118,7 @@
<stopKey>foo</stopKey>
<stopPort>9999</stopPort>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
<resources>
@@ -140,8 +141,8 @@
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
</plugins>
</build>
@@ -172,37 +173,37 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-core</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldpath</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldcache</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-reasoner</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-sparql</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-security</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-versioning</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<!--
<dependency>
@@ -214,7 +215,7 @@
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-user</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Servlet / CDI Environment -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9760ed6c/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 54a76ed..d4acfa8 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>ldclient-api</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.0-incubating-SNAPSHOT</version>
<name>LDClient: API</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9760ed6c/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 627a21c..41db1cf 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>ldclient-core</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.0-incubating-SNAPSHOT</version>
<name>LDClient: Core Library</name>
<description>
@@ -111,15 +111,15 @@
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.2</version>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.2</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9760ed6c/platform/marmotta-core/target/maven-archiver/pom.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/target/maven-archiver/pom.properties b/platform/marmotta-core/target/maven-archiver/pom.properties
index ec80558..4cf380c 100644
--- a/platform/marmotta-core/target/maven-archiver/pom.properties
+++ b/platform/marmotta-core/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Tue Feb 19 18:07:59 CET 2013
-version=3.0.0-SNAPSHOT
+#Tue Feb 19 22:05:46 CET 2013
+version=3.0.0-incubating-SNAPSHOT
groupId=org.apache.marmotta
artifactId=marmotta-core
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/9760ed6c/platform/marmotta-sparql/target/maven-archiver/pom.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/target/maven-archiver/pom.properties b/platform/marmotta-sparql/target/maven-archiver/pom.properties
index 940ad1b..ff7c3a5 100644
--- a/platform/marmotta-sparql/target/maven-archiver/pom.properties
+++ b/platform/marmotta-sparql/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Tue Feb 19 18:08:50 CET 2013
-version=3.0.0-SNAPSHOT
+#Tue Feb 19 22:06:32 CET 2013
+version=3.0.0-incubating-SNAPSHOT
groupId=org.apache.marmotta
artifactId=marmotta-sparql