Author: reto
Date: Thu Feb 11 13:23:13 2010
New Revision: 908958
URL: http://svn.apache.org/viewvc?rev=908958&view=rev
Log:
CLEREZZA-102: update to jena 2.6.2
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.tdb/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena/pom.xml?rev=908958&r1=908957&r2=908958&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.ext.com.hp.hpl.jena/pom.xml
Thu Feb 11 13:23:13 2010
@@ -12,6 +12,20 @@
<name>Clerezza Ext - Jena OSGi Bundle</name>
<description>All required dependencies for Jena</description>
<dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>xmlParserAPIs</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xercesImpl</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
@@ -44,15 +58,14 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Embed-Dependency>*;artifactId=!commons-logging</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
-
<Import-Package>!com.hp.hpl.jena.test,!com.hp.hpl.jena.*.test,!arq.*,
-
!com.hp.hpl.*.junit,!javax.xml.transform.stream,!javax.xml.stream,
-
!org.apache.lucene.*,!com.hp.hpl.jena.graph.test,!javax.mail.*,
-
!junit.*,!org.apache.xml.resolver.*,!antlr.parseview,!sun.*,
-
!org.w3c.dom.ls,!org.json.*,!org.apache.avalon.*,
- !org.apache.log,
- <!-- !org.apache.xerces.impl.*,
-->
-
!org.apache.xerces.impl.validation.*,
- !org.xml.sax.*,
+
<Import-Package>!com.hp.hpl.jena.test,!com.hp.hpl.jena.*.test,
+ !com.hp.hpl.*.junit,
+
!junit.*,!org.apache.xml.resolver.*,!sun.*,
+ !org.junit.*,
+ !com.sun.msv.*,
+ !com.sun.jdmk.*,
+ !javax.jms.*,
+ !org.relaxng.*,
*</Import-Package>
<Export-Package>com.hp.hpl.jena.*, org.apache.xerces.util</Export-Package>
</instructions>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.tdb/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.tdb/pom.xml?rev=908958&r1=908957&r2=908958&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.tdb/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.tdb/pom.xml
Thu Feb 11 13:23:13 2010
@@ -48,7 +48,7 @@
<outputDirectory>target/extracted</outputDirectory>
<includes>**</includes>
<excludes>
- META-INF/**
+
META-INF/**,**/com.hp.hpl.jena*
</excludes>
</configuration>
</execution>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/pom.xml?rev=908958&r1=908957&r2=908958&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/pom.xml
Thu Feb 11 13:23:13 2010
@@ -21,6 +21,10 @@
<artifactId>org.apache.clerezza.rdf.jena.facade</artifactId>
</dependency>
<dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=908958&r1=908957&r2=908958&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Thu Feb 11
13:23:13 2010
@@ -367,7 +367,7 @@
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
- <version>2.6.0</version>
+ <version>2.6.2</version>
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
@@ -375,6 +375,11 @@
<version>0.8.4</version>
</dependency>
<dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <version>2.8.2</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.4</version>
