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/02/03 12:53:42 UTC
[1/2] git commit: fixed a few (minor) eclipse warnings
Updated Branches:
refs/heads/develop 5dbe1f491 -> f3f2dc36d
fixed a few (minor) eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/28a6530a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/28a6530a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/28a6530a
Branch: refs/heads/develop
Commit: 28a6530a1232c49816acc4cb89e829bfc171eeb1
Parents: 5dbe1f4
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Feb 3 11:35:57 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Feb 3 11:36:23 2014 +0100
----------------------------------------------------------------------
.../marmotta-rio-rss/pom.xml | 1 -
parent/pom.xml | 51 ++++++++++++++++----
2 files changed, 42 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/28a6530a/commons/marmotta-sesame-tools/marmotta-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/pom.xml b/commons/marmotta-sesame-tools/marmotta-rio-rss/pom.xml
index c85b5c0..ea6dee4 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/pom.xml
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/pom.xml
@@ -34,7 +34,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>add-ext</id>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/28a6530a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0c1b630..6044cbe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -267,15 +267,9 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>
- org.apache.felix
- </groupId>
- <artifactId>
- maven-scr-plugin
- </artifactId>
- <versionRange>
- [1.8.0,)
- </versionRange>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <versionRange>[1.8.0,)</versionRange>
<goals>
<goal>scr</goal>
</goals>
@@ -297,6 +291,45 @@
<ignore />
</action>
</pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.zeroturnaround</groupId>
+ <artifactId>jrebel-maven-plugin</artifactId>
+ <versionRange>1.1.3</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <versionRange>[1.7,)</versionRange>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
[2/2] git commit: updated loader-poms to avoid dependency-reduced-pom
creation
Posted by ja...@apache.org.
updated loader-poms to avoid dependency-reduced-pom creation
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f3f2dc36
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f3f2dc36
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f3f2dc36
Branch: refs/heads/develop
Commit: f3f2dc36d2cb702395902dce774c2e1328824e2f
Parents: 28a6530
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Feb 3 12:06:46 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Feb 3 12:06:46 2014 +0100
----------------------------------------------------------------------
loader/marmotta-loader-berkeley/pom.xml | 1 +
loader/marmotta-loader-hbase/pom.xml | 2 +-
loader/marmotta-loader-kiwi/pom.xml | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f3f2dc36/loader/marmotta-loader-berkeley/pom.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-berkeley/pom.xml b/loader/marmotta-loader-berkeley/pom.xml
index adf4418..c68a409 100644
--- a/loader/marmotta-loader-berkeley/pom.xml
+++ b/loader/marmotta-loader-berkeley/pom.xml
@@ -45,6 +45,7 @@
<goal>shade</goal>
</goals>
<configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f3f2dc36/loader/marmotta-loader-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-hbase/pom.xml b/loader/marmotta-loader-hbase/pom.xml
index 9cc2bff..f82d8f6 100644
--- a/loader/marmotta-loader-hbase/pom.xml
+++ b/loader/marmotta-loader-hbase/pom.xml
@@ -45,7 +45,7 @@
<goal>shade</goal>
</goals>
<configuration>
-
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f3f2dc36/loader/marmotta-loader-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/loader/marmotta-loader-kiwi/pom.xml b/loader/marmotta-loader-kiwi/pom.xml
index a1110a1..2997dba 100644
--- a/loader/marmotta-loader-kiwi/pom.xml
+++ b/loader/marmotta-loader-kiwi/pom.xml
@@ -45,7 +45,7 @@
<goal>shade</goal>
</goals>
<configuration>
-
+ <createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">