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 2013/03/26 16:00:17 UTC
[1/2] git commit: added another exception to the rule that all
artifact 'marmotta-*' are not dependencies
Updated Branches:
refs/heads/master c484a095f -> 3844cbd22
added another exception to the rule that all artifact 'marmotta-*' are not dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1a1c9605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1a1c9605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1a1c9605
Branch: refs/heads/master
Commit: 1a1c96056147c1ba4fd56ed2f98a1ea6a4ec98c0
Parents: 471087b
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Mar 26 15:59:18 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Mar 26 15:59:18 2013 +0100
----------------------------------------------------------------------
.../maven/plugins/refpack/RefPackMojo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1a1c9605/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 07439ae..91779ad 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
@@ -193,7 +193,7 @@ public class RefPackMojo extends AbstractMojo {
private void collectLibraryDependencies(DependencyNode node, Artifact currentModule) {
String groupId = node.getDependency().getArtifact().getGroupId();
String artifactId = node.getDependency().getArtifact().getArtifactId();
- if(!groupId.equals(moduleGroupId) || !artifactId.startsWith("marmotta-") || artifactId.equals("marmotta-commons")) {
+ if(!groupId.equals(moduleGroupId) || !artifactId.startsWith("marmotta-") || artifactId.equals("marmotta-commons") || artifactId.equals("marmotta-client-js")) {
// first check if the current artifact is already covered by a module the current module depends on
for(Artifact dependentArtifact : moduleDependencies.get(currentModule)) {
if(moduleLibraries.containsKey(dependentArtifact) &&
@@ -219,7 +219,7 @@ public class RefPackMojo extends AbstractMojo {
private void collectModuleDependencies(DependencyNode node, Artifact currentModule) {
String groupId = node.getDependency().getArtifact().getGroupId();
String artifactId = node.getDependency().getArtifact().getArtifactId();
- if(groupId.equals(moduleGroupId) && artifactId.startsWith("marmotta-") && !artifactId.equals("marmotta-commons")) {
+ if(groupId.equals(moduleGroupId) && artifactId.startsWith("marmotta-") && !artifactId.equals("marmotta-commons") && !artifactId.equals("marmotta-client-js")) {
moduleDependencies.get(currentModule).add(node.getDependency().getArtifact());
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Posted by wi...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3844cbd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3844cbd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3844cbd2
Branch: refs/heads/master
Commit: 3844cbd2276176b0f9e2a491785375d87e0cf000
Parents: 1a1c960 c484a09
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Mar 26 15:59:24 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Mar 26 15:59:24 2013 +0100
----------------------------------------------------------------------
LICENSE.txt | 90 ++-
.../src/main/resources/installer/LICENSE.txt | 780 +++++++++++++--
.../src/main/resources/installer/NOTICE.txt | 545 ++++++++++-
.../src/main/webapp/META-INF/NOTICE | 12 -
.../src/main/doc/NOTICE.txt | 13 +-
5 files changed, 1314 insertions(+), 126 deletions(-)
----------------------------------------------------------------------