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:15 UTC

[1/5] git commit: Removed "DISCLAIMER.txt" from assembly and installer, we are not incubating any more!

Repository: marmotta
Updated Branches:
  refs/heads/develop 02900568f -> 73d80e0c5


Removed "DISCLAIMER.txt" from assembly and installer, we are not incubating any more!


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

Branch: refs/heads/develop
Commit: 5b30dae9cf0b502a94d7d82401a9ffecf6740a45
Parents: 47ee5ac
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 09:45:09 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 09:59:29 2014 +0100

----------------------------------------------------------------------
 launchers/marmotta-installer/pom.xml   | 7 -------
 launchers/marmotta-webapp/assembly.xml | 8 +-------
 2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/5b30dae9/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 521d3c6..6733e72 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -320,13 +320,6 @@
                                             </includes>
                                             <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}.jar/META-INF</outputDirectory>
                                         </fileset>
-                                        <fileset>
-                                            <directory>${project.basedir}/../..</directory>
-                                            <includes>
-                                                <include>DISCLAIMER.txt</include>
-                                            </includes>
-                                            <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}.jar/META-INF</outputDirectory>
-                                        </fileset>
                                     </filesets>
                                 </configuration>
                             </execution>

http://git-wip-us.apache.org/repos/asf/marmotta/blob/5b30dae9/launchers/marmotta-webapp/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/assembly.xml b/launchers/marmotta-webapp/assembly.xml
index fdeccf1..cd76e27 100644
--- a/launchers/marmotta-webapp/assembly.xml
+++ b/launchers/marmotta-webapp/assembly.xml
@@ -43,12 +43,6 @@
             <filtered>true</filtered>
         </file>
         <file>
-            <source>${project.basedir}/../../DISCLAIMER.txt</source>
-            <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
-            <filtered>true</filtered>
-        </file>
-        <file>
             <source>${project.basedir}/src/main/webapp/META-INF/NOTICE</source>
             <destName>NOTICE.txt</destName>
             <outputDirectory>/</outputDirectory>
@@ -60,4 +54,4 @@
             <fileMode>0644</fileMode>
         </file>
     </files>
-</assembly>
\ No newline at end of file
+</assembly>


[5/5] git commit: fixed some warining in the usage of the refpack-maven-plugin

Posted by ja...@apache.org.
fixed some warining in the usage of the refpack-maven-plugin


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

Branch: refs/heads/develop
Commit: 73d80e0c5e46ef843ab06619368c1ece81e1ba61
Parents: d9635a2
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 14:26:40 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 14:26:40 2014 +0100

----------------------------------------------------------------------
 .../org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/73d80e0c/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
index 8136480..658baef 100644
--- a/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
+++ b/build/plugins/refpack-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/refpack/RefPackMojo.java
@@ -78,7 +78,7 @@ public class RefPackMojo extends AbstractMojo {
      * the dependency tree, the process will break at each module of this group id and instead add
      * a dependency to the other module to the refpacks.
      */
-    @Parameter(property="refpack.moduleGroupId", defaultValue="org.apache.marmotta", required = true, readonly = true)
+    @Parameter(property="refpack.moduleGroupId", defaultValue="org.apache.marmotta", required = true)
     private String moduleGroupId;
 
     /**
@@ -106,7 +106,7 @@ public class RefPackMojo extends AbstractMojo {
     /**
      * The required modules of the refpack
      */
-    @Parameter(property = "refpack.requiredModules", readonly = true)
+    @Parameter(property = "refpack.requiredModules")
     private List<String> requiredModules;
 
     // we collect here the library dependencies of each module, so we can identify which of the dependencies are already


[4/5] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop

Posted by ja...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop


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

Branch: refs/heads/develop
Commit: d9635a27251ff29f1a6e69cf8ba241e8189383dd
Parents: 22552da 0290056
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 14:21:08 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 14:21:08 2014 +0100

----------------------------------------------------------------------
 .../test/externalizer/ExternalizerTest.java     |  6 ++
 .../org/apache/marmotta/kiwi/io/KiWiIO.java     | 92 +++++++++++++++++++-
 parent/pom.xml                                  | 12 ++-
 platform/backends/marmotta-backend-kiwi/pom.xml |  4 -
 4 files changed, 107 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/d9635a27/parent/pom.xml
----------------------------------------------------------------------


[3/5] git commit: removed zookeeper from the installer

Posted by ja...@apache.org.
removed zookeeper from the installer


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

Branch: refs/heads/develop
Commit: 22552da01d9f121b683641f1d5e5a510eb489f7a
Parents: 0ae97e7
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 13:51:00 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 13:51:00 2014 +0100

----------------------------------------------------------------------
 .../marmotta-installer/src/main/resources/installer/standalone.xml  | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/22552da0/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 023ac98..2590979 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
+++ b/launchers/marmotta-installer/src/main/resources/installer/standalone.xml
@@ -124,7 +124,6 @@
         <refpack file="refpacks/marmotta-user.xml" />
         <refpack file="refpacks/marmotta-versioning-common.xml" />
         <refpack file="refpacks/marmotta-versioning-kiwi.xml" />
-        <refpack file="refpacks/marmotta-zookeeper.xml" />
     </packs>
 
     <!-- shortcut generation -->


[2/5] git commit: moved zookeeper dependency into separate profile

Posted by ja...@apache.org.
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>