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 2017/10/03 21:03:24 UTC

[1/2] jena git commit: Fix assembly warning

Repository: jena
Updated Branches:
  refs/heads/master a3bea6986 -> 93e94bd65


Fix assembly warning


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

Branch: refs/heads/master
Commit: 469a92511b8d0579d5373d2c149717baa3834dc9
Parents: a3bea69
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 3 22:02:55 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 3 22:02:55 2017 +0100

----------------------------------------------------------------------
 apache-jena/assembly-jena-zip.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/469a9251/apache-jena/assembly-jena-zip.xml
----------------------------------------------------------------------
diff --git a/apache-jena/assembly-jena-zip.xml b/apache-jena/assembly-jena-zip.xml
index ac26470..57d8bcb 100644
--- a/apache-jena/assembly-jena-zip.xml
+++ b/apache-jena/assembly-jena-zip.xml
@@ -115,7 +115,7 @@
   <fileSets>
 
     <fileSet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory></outputDirectory>
       <includes>
         <include>bin/*</include>
       </includes>
@@ -124,7 +124,7 @@
     </fileSet>
 
     <fileSet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory></outputDirectory>
       <includes>
         <include>jena-log4j.properties</include>
       </includes> 
@@ -132,7 +132,7 @@
     </fileSet>
     
     <fileSet>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory></outputDirectory>
       <includes>
         <include>bat/*</include>
       </includes>


[2/2] jena git commit: Put TDB2 into apache-jena-libs

Posted by an...@apache.org.
Put TDB2 into apache-jena-libs


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

Branch: refs/heads/master
Commit: 93e94bd658f0e48d56b23929154b338ecc0dffed
Parents: 469a925
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Oct 3 22:03:17 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Oct 3 22:03:17 2017 +0100

----------------------------------------------------------------------
 apache-jena-libs/pom.xml              | 2 --
 jena-cmds/pom.xml                     | 8 --------
 jena-fuseki2/jena-fuseki-core/pom.xml | 7 -------
 3 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/93e94bd6/apache-jena-libs/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index f4f55f3..b9d91f1 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -46,13 +46,11 @@
       <version>3.5.0-SNAPSHOT</version>
     </dependency>
 
-    <!--
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb2</artifactId>
       <version>3.5.0-SNAPSHOT</version>
     </dependency>
-    -->
 
     <dependency>
       <groupId>org.apache.jena</groupId>

http://git-wip-us.apache.org/repos/asf/jena/blob/93e94bd6/jena-cmds/pom.xml
----------------------------------------------------------------------
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index e213fc4..dde4ed3 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -71,14 +71,6 @@
       <type>pom</type>
     </dependency>
 
-    <!-- Until included in apache-jena-lib-->
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb2</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-    
-
     <!-- Command Logging -->
     <dependency>
       <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/jena/blob/93e94bd6/jena-fuseki2/jena-fuseki-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index 57e045f..ba22512 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -56,13 +56,6 @@
       <type>pom</type>
     </dependency>
 
-    <!-- Until included in apache-jena-lib-->
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-tdb2</artifactId>
-      <version>3.5.0-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>