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 2011/07/29 17:32:08 UTC
svn commit: r1152264 - in /incubator/jena/Jena2: ARQ/trunk/ ARQ/trunk/lib/
Fuseki/trunk/ TDB/trunk/ TDB/trunk/lib/
Author: andy
Date: Fri Jul 29 15:32:06 2011
New Revision: 1152264
URL: http://svn.apache.org/viewvc?rev=1152264&view=rev
Log:
Update jars
Added:
incubator/jena/Jena2/ARQ/trunk/lib/junit-4.8.2.jar (with props)
incubator/jena/Jena2/ARQ/trunk/lib/log4j-1.2.16.jar (with props)
incubator/jena/Jena2/ARQ/trunk/lib/slf4j-api-1.6.1.jar (with props)
incubator/jena/Jena2/ARQ/trunk/lib/slf4j-log4j12-1.6.1.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/junit-4.8.2.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/log4j-1.2.16.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/slf4j-api-1.6.1.jar (with props)
incubator/jena/Jena2/TDB/trunk/lib/slf4j-log4j12-1.6.1.jar (with props)
incubator/jena/Jena2/TDB/trunk/mvn-update (with props)
Modified:
incubator/jena/Jena2/ARQ/trunk/.classpath
incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
incubator/jena/Jena2/ARQ/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/.classpath
incubator/jena/Jena2/TDB/trunk/.classpath
incubator/jena/Jena2/TDB/trunk/pom.xml
Modified: incubator/jena/Jena2/ARQ/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/.classpath?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/.classpath (original)
+++ incubator/jena/Jena2/ARQ/trunk/.classpath Fri Jul 29 15:32:06 2011
@@ -7,10 +7,10 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="lib" path="lib/icu4j-3.4.4.jar"/>
<classpathentry kind="lib" path="lib/iri-0.8.jar" sourcepath="lib-src/iri-0.8-sources.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.5.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="lib/jena-2.6.4-tests.jar" sourcepath="lib-src/jena-2.6.4-test-sources.jar"/>
<classpathentry kind="lib" path="lib/jena-2.6.4.jar" sourcepath="lib-src/jena-2.6.4-sources.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
Modified: incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/ChangeLog.txt Fri Jul 29 15:32:06 2011
@@ -3,6 +3,7 @@ ChangeLog for ARQ
==== ARQ 2.8.10
++ General upgrade of dependent systems (not Lucene - see LARQ module for use with Lucene 3)
+ Make CONCAT follow the SPARQL 1.1 spec properly.
+ Bug fix: ORDER BY and FILTERs in sub-selects didn't work if ordering by non-SELECT variables.
+ Bug fix: Equality of algebra operator (order) wasn't checkign all aspects of the op.
Added: incubator/jena/Jena2/ARQ/trunk/lib/junit-4.8.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/lib/junit-4.8.2.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/ARQ/trunk/lib/junit-4.8.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/ARQ/trunk/lib/log4j-1.2.16.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/lib/log4j-1.2.16.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/ARQ/trunk/lib/log4j-1.2.16.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/ARQ/trunk/lib/slf4j-api-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/lib/slf4j-api-1.6.1.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/ARQ/trunk/lib/slf4j-api-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/ARQ/trunk/lib/slf4j-log4j12-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/lib/slf4j-log4j12-1.6.1.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/ARQ/trunk/lib/slf4j-log4j12-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jena/Jena2/ARQ/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom.xml?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom.xml Fri Jul 29 15:32:06 2011
@@ -40,6 +40,13 @@
<this.root>${project.artifactId}-${project.version}</this.root>
<ver.jena>2.6.4</ver.jena>
<ver.arq>${project.version}</ver.arq>
+ <ver.iri>0.8</ver.iri>
+ <ver.wstx-asl>3.2.9</ver.wstx-asl>
+ <ver.lucene>2.3.1</ver.lucene>
+ <ver.junit>4.8.2</ver.junit>
+ <ver.slf4j>1.6.1</ver.slf4j>
+ <ver.log4j>1.2.16</ver.log4j>
+ <ver.commons-codec>1.5</ver.commons-codec>
</properties>
<dependencies>
@@ -67,7 +74,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.9</version>
+ <version>${ver.wstx-asl}</version>
<!--
And recode XMLInputStax to use STaX2 as stil have the same problems of STaX1 if just upgrade woodstox.
<groupId>org.codehaus.woodstox</groupId>
@@ -79,28 +86,28 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
- <version>2.3.1</version>
+ <version>${ver.lucene}</version>
</dependency>
<!--
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>${ver.commons-codec}</version>
</dependency>
-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>${ver.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>${ver.slf4j}</version>
</dependency>
<!-- Choose your logging provider
@@ -112,14 +119,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <version>${ver.slf4j}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>${ver.log4j}</version>
<!--<optional>true</optional>-->
<exclusions>
<exclusion>
@@ -241,10 +248,9 @@
-->
<!-- "Other packages" catches everything else unless excluded -->
</groups>
- <bottom>Copyright © 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
-Copyright © 2010 Talis Systems Ltd.
-Copyright © 2010, 2011 Epimorphics Ltd.
- </bottom>
+ <bottom>
+ Licenced under the Apache License, Version 2.0
+ </bottom>
</configuration>
</plugin>
@@ -314,6 +320,7 @@ build.time.txt=${build.time.txt}
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>RELEASE</version>
<configuration>
<buildOutputDirectory>${project.build.directory}/classes-eclipse</buildOutputDirectory>
<downloadSources>true</downloadSources>
Modified: incubator/jena/Jena2/Fuseki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/.classpath?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/.classpath (original)
+++ incubator/jena/Jena2/Fuseki/trunk/.classpath Fri Jul 29 15:32:06 2011
@@ -35,11 +35,11 @@
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1-glassfish/2.1.v20100127/jsp-2.1-glassfish-2.1.v20100127.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1-glassfish/2.1.v20100127/jsp-api-2.1-glassfish-2.1.v20100127.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2.jar" sourcepath="M2_REPO/com/hp/hpl/jena/sdb/1.3.2/sdb-1.3.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.8/slf4j-log4j12-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar" sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
Modified: incubator/jena/Jena2/TDB/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/.classpath?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/.classpath (original)
+++ incubator/jena/Jena2/TDB/trunk/.classpath Fri Jul 29 15:32:06 2011
@@ -8,11 +8,11 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="lib" path="lib/icu4j-3.4.4.jar"/>
<classpathentry kind="lib" path="lib/iri-0.8.jar" sourcepath="lib-src/iri-0.8-sources.jar"/>
- <classpathentry kind="lib" path="lib/junit-4.5.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+ <classpathentry kind="lib" path="lib/junit-4.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-2.3.1.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/stax-api-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
Added: incubator/jena/Jena2/TDB/trunk/lib/junit-4.8.2.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/junit-4.8.2.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/junit-4.8.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/lib/log4j-1.2.16.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/log4j-1.2.16.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/log4j-1.2.16.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/lib/slf4j-api-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/slf4j-api-1.6.1.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/slf4j-api-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/lib/slf4j-log4j12-1.6.1.jar
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/lib/slf4j-log4j12-1.6.1.jar?rev=1152264&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/jena/Jena2/TDB/trunk/lib/slf4j-log4j12-1.6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/jena/Jena2/TDB/trunk/mvn-update
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/mvn-update?rev=1152264&view=auto
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/mvn-update (added)
+++ incubator/jena/Jena2/TDB/trunk/mvn-update Fri Jul 29 15:32:06 2011
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -e "lib-src" ]
+then
+ mvn dependency:copy-dependencies \
+ -Dclassifier="sources" \
+ -DoutputDirectory=lib-src \
+ -DincludeGroupIds="com.hp.hpl.jena"
+
+ mvn dependency:copy-dependencies \
+ -Dclassifier="test-sources" \
+ -DincludeScope="test" \
+ -DoutputDirectory=lib-src \
+ -DincludeArtifactIds="jena,arq" \
+ -DincludeGroupIds="com.hp.hpl.jena"
+fi
+
+mvn dependency:copy-dependencies -DoutputDirectory=lib
+
+# This is a fix for Jena 2.6.3 and ARQ 2.8.5 which depends on IRI sources.
+rm -f lib/*-sources*
Propchange: incubator/jena/Jena2/TDB/trunk/mvn-update
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Jena2/TDB/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/pom.xml?rev=1152264&r1=1152263&r2=1152264&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/pom.xml (original)
+++ incubator/jena/Jena2/TDB/trunk/pom.xml Fri Jul 29 15:32:06 2011
@@ -41,6 +41,10 @@
<this.root>${project.artifactId}-${project.version}</this.root>
<ver.jena>2.6.4</ver.jena>
<ver.arq>2.8.9-SNAPSHOT</ver.arq>
+ <ver.iri>0.8</ver.iri>
+ <ver.junit>4.8.2</ver.junit>
+ <ver.slf4j>1.6.1</ver.slf4j>
+ <ver.log4j>1.2.16</ver.log4j>
</properties>
<dependencies>
@@ -77,20 +81,20 @@
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>iri</artifactId>
- <version>0.8</version>
+ <version>${ver.iri}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>${ver.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
+ <version>${ver.slf4j}</version>
</dependency>
<!-- Choose your logging provider
@@ -103,14 +107,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<optional>true</optional>
- <version>1.5.8</version>
+ <version>${ver.slf4j}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <optional>true</optional>
+ <version>${ver.log4j}</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>