You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/05/20 23:34:14 UTC

[1/2] jena git commit: Revert "Comment out helpmojo (cause build failure)"

Repository: jena
Updated Branches:
  refs/heads/master 0e9a05d29 -> b33e2ed9a


Revert "Comment out helpmojo (cause build failure)"

This reverts commit 0e9a05d290a66306235c2937e822c096cad4f2ea.


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

Branch: refs/heads/master
Commit: 464119c6ed720d6d7cfb570ec1644f57ba57dd87
Parents: 0e9a05d
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 21 00:01:35 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 21 00:01:35 2016 +0100

----------------------------------------------------------------------
 jena-maven-tools/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/464119c6/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index bfc3435..04d9ca2 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -71,12 +71,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-
         <configuration>
           <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
-
         <executions>
           <execution>
             <id>mojo-descriptor</id>
@@ -84,15 +82,13 @@
               <goal>descriptor</goal>
             </goals>
           </execution>
-          <!-- Breaks : reason unknown : apache POM 18 -->
-          <!-- if you want to generate help goal - ->
+          <!-- if you want to generate help goal -->
           <execution>
             <id>help-goal</id>
             <goals>
               <goal>helpmojo</goal>
             </goals>
           </execution>
-          -->
         </executions>
       </plugin>
       <plugin>


[2/2] jena git commit: JENA-1184: Comment out jena-maven-tools

Posted by an...@apache.org.
JENA-1184: Comment out jena-maven-tools


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

Branch: refs/heads/master
Commit: b33e2ed9a41022c906afe4d718b16380f839139e
Parents: 464119c
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 21 00:10:21 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 21 00:10:21 2016 +0100

----------------------------------------------------------------------
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b33e2ed9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 77fc7da..aa3e879 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,10 @@
         <module>jena-permissions</module>
 
         <module>jena-jdbc</module>
-        <module>jena-maven-tools</module>
+        <!-- Removed because this breaks the build after the 
+             upgrade of Apache parent PM to v18 - see JENA-1184 
+        -->
+        <!-- <module>jena-maven-tools</module> -->
         <module>jena-elephas</module>
 
         <module>apache-jena</module>