You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/06/13 10:58:17 UTC
[057/100] [abbrv] git commit: MARMOTTA-481: removed experimental tag
from marmotta-ldp, added by default to marmotta-webapp and marmotta-installer.
MARMOTTA-481: removed experimental tag from marmotta-ldp, added by default to marmotta-webapp and marmotta-installer.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/2983aeaf
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/2983aeaf
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/2983aeaf
Branch: refs/heads/ldp
Commit: 2983aeaff0b1b50469498b30aa556f400f525409
Parents: 27ccb55
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Apr 8 11:03:37 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Apr 8 11:05:47 2014 +0200
----------------------------------------------------------------------
.../src/main/resources/installer/standalone.xml | 1 +
launchers/marmotta-webapp/pom.xml | 16 +++++-----------
platform/marmotta-ldp/pom.xml | 2 +-
platform/pom.xml | 13 +++----------
4 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2983aeaf/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
index 7d392aa..f14d4f3 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
+++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
@@ -114,6 +114,7 @@
<refpack file="refpacks/marmotta-webapp.xml" />
<refpack file="refpacks/marmotta-core.xml" />
<refpack file="refpacks/marmotta-backend-kiwi.xml" />
+ <refpack file="refpacks/marmotta-ldp.xml" />
<refpack file="refpacks/marmotta-ldcache-common.xml" />
<refpack file="refpacks/marmotta-ldcache-kiwi.xml" />
<refpack file="refpacks/marmotta-ldpath.xml" />
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2983aeaf/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index fc925d0..4f90733 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -199,17 +199,6 @@
<profiles>
- <profile>
- <id>experimental</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-ldp</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
<!-- backend profiles -->
<profile>
@@ -467,6 +456,11 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-ldp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-sparql</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2983aeaf/platform/marmotta-ldp/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/pom.xml b/platform/marmotta-ldp/pom.xml
index 247e693..a5bcdfe 100644
--- a/platform/marmotta-ldp/pom.xml
+++ b/platform/marmotta-ldp/pom.xml
@@ -30,7 +30,7 @@
<name>Apache Marmotta Platform: LDP</name>
<description>
- Provides experimental support for the current working draft of the
+ Provides support for the current working draft of the
Linked Data Platform 1.0 specification.
</description>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/2983aeaf/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 7581785..3614050 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -70,6 +70,9 @@
<module>backends</module>
<module>ldcache</module>
+ <!-- LDP -->
+ <module>marmotta-ldp</module>
+
<!-- generic modules -->
<module>marmotta-ldpath</module>
<module>marmotta-security</module>
@@ -87,14 +90,4 @@
</modules>
- <profiles>
- <!-- experimental modules -->
- <profile>
- <id>experimental</id>
- <modules>
- <module>marmotta-ldp</module>
- </modules>
- </profile>
- </profiles>
-
</project>