clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1483808 - in /clerezza/trunk: ext.org.apache.jena.tdb/pom.xml ext.org.apache.jena/pom.xml parent/pom.xml platform.launcher.storageless.parent/pom.xml platform.launcher.tdb/pom.xml rdf.rdfa/pom.xml
Date Fri, 17 May 2013 14:03:51 GMT
Author: reto
Date: Fri May 17 14:03:50 2013
New Revision: 1483808

URL: http://svn.apache.org/r1483808
Log:
CLEREZZA-780: updated dependencies to provided required packages and inlined rootdev rdfa
parser as newer version not an OSGi bundle

Modified:
    clerezza/trunk/ext.org.apache.jena.tdb/pom.xml
    clerezza/trunk/ext.org.apache.jena/pom.xml
    clerezza/trunk/parent/pom.xml
    clerezza/trunk/platform.launcher.storageless.parent/pom.xml
    clerezza/trunk/platform.launcher.tdb/pom.xml
    clerezza/trunk/rdf.rdfa/pom.xml

Modified: clerezza/trunk/ext.org.apache.jena.tdb/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.org.apache.jena.tdb/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/ext.org.apache.jena.tdb/pom.xml (original)
+++ clerezza/trunk/ext.org.apache.jena.tdb/pom.xml Fri May 17 14:03:50 2013
@@ -92,7 +92,7 @@
                         !javax.jmdns,
                         !org.apache.xerces.util,
                         *</Import-Package>
-                        <Export-Package>com.hp.hpl.jena.*</Export-Package>
+                        <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: clerezza/trunk/ext.org.apache.jena/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/ext.org.apache.jena/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/ext.org.apache.jena/pom.xml (original)
+++ clerezza/trunk/ext.org.apache.jena/pom.xml Fri May 17 14:03:50 2013
@@ -89,7 +89,7 @@
                         !com.ibm.uvm.tools,
                         !javax.jmdns,
                         *</Import-Package>
-                        <Export-Package>com.hp.hpl.jena.*, org.apache.xerces.util</Export-Package>
+                        <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*, org.apache.xerces.util</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: clerezza/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/parent/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/parent/pom.xml (original)
+++ clerezza/trunk/parent/pom.xml Fri May 17 14:03:50 2013
@@ -493,12 +493,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore-osgi</artifactId>
-                <version>4.1</version>
+                <version>4.2.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.1</version>
+                <version>4.2.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -541,7 +541,7 @@
             <dependency>
                 <groupId>net.rootdev</groupId>
                 <artifactId>java-rdfa</artifactId>
-                <version>0.4.2-RC2</version>
+                <version>0.4.2</version>
             </dependency>
             <dependency>
                 <groupId>net.rootdev</groupId>

Modified: clerezza/trunk/platform.launcher.storageless.parent/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.launcher.storageless.parent/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/platform.launcher.storageless.parent/pom.xml (original)
+++ clerezza/trunk/platform.launcher.storageless.parent/pom.xml Fri May 17 14:03:50 2013
@@ -133,6 +133,7 @@
             <artifactId>commons-codec</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <!-- these are now embeded as most recent version is not OSGi bundle
         <dependency>
             <groupId>net.rootdev</groupId>
             <artifactId>java-rdfa</artifactId>
@@ -140,7 +141,7 @@
         <dependency>
             <groupId>net.rootdev</groupId>
             <artifactId>java-rdfa-htmlparser</artifactId>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>

Modified: clerezza/trunk/platform.launcher.tdb/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.launcher.tdb/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/platform.launcher.tdb/pom.xml (original)
+++ clerezza/trunk/platform.launcher.tdb/pom.xml Fri May 17 14:03:50 2013
@@ -190,5 +190,10 @@
             <scope>runtime</scope>
             <version>0.4-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>14.0</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

Modified: clerezza/trunk/rdf.rdfa/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.rdfa/pom.xml?rev=1483808&r1=1483807&r2=1483808&view=diff
==============================================================================
--- clerezza/trunk/rdf.rdfa/pom.xml (original)
+++ clerezza/trunk/rdf.rdfa/pom.xml Fri May 17 14:03:50 2013
@@ -51,12 +51,16 @@
         <dependency>
             <groupId>net.rootdev</groupId>
             <artifactId>java-rdfa</artifactId>
-            <version>0.4.2-RC2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.rootdev</groupId>
             <artifactId>java-rdfa-htmlparser</artifactId>
-            <version>0.4.2-RC2</version>
         </dependency>
         <dependency>
             <groupId>nu.validator.htmlparser</groupId>
@@ -71,4 +75,28 @@
             <version>1.1</version>
         </dependency> -->
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Embed-Dependency>*;groupId=net.rootdev</Embed-Dependency>
+                        <Embed-Transitive>false</Embed-Transitive>
+                        <Export-Package>
+                        </Export-Package>
+                        <Import-Package>
+                            !com.ibm.uvm.tools,!com.thoughtworks.qdox.model,
+                            !javax.microedition.io,!javax.persistence,!nu.xom,
+                            !org.apache.felix.*,!org.mozilla.*,
+                            !nu.validator.saxtree,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file



Mime
View raw message