Author: rwesten
Date: Mon Jun 25 17:19:54 2012
New Revision: 1353670
URL: http://svn.apache.org/viewvc?rev=1353670&view=rev
Log:
STANBOL-667: Added exclusion for the "owlapi" to the hermit dependency. This
avoids importing the owlapi that is anyway includes in the "o.a.s.commons.owl"
module.
Additionally I removed the "owlapi" from the parent pom as it is anyway only
referenced by "o.a.s.commons.owl" and loaded from an embedded maven repository
of this module.
Modified:
incubator/stanbol/trunk/commons/owl/pom.xml
incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml
incubator/stanbol/trunk/parent/pom.xml
Modified: incubator/stanbol/trunk/commons/owl/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/owl/pom.xml?rev=1353670&r1=1353669&r2=1353670&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/owl/pom.xml (original)
+++ incubator/stanbol/trunk/commons/owl/pom.xml Mon Jun 25 17:19:54 2012
@@ -95,10 +95,10 @@
<exclude>src/license/THIRD-PARTY.properties</exclude>
<!-- See src/main/resources/maven/repo/README file -->
-
<exclude>src/main/resources/maven/repo/owlapi/owlapi/maven-metadata-local.xml</exclude>
-
<exclude>src/main/resources/maven/repo/owlapi/owlapi/3.2.3/owlapi-3.2.3.pom</exclude>
-
<exclude>src/main/resources/maven/repo/owlapi/owlapi/3.2.3/owlapi-3.2.3.jar</exclude>
-
<exclude>src/main/resources/maven/repo/owlapi/owlapi/3.2.3/owlapi-3.2.3-sources.jar</exclude>
+
<exclude>src/main/resources/maven/repo/net/sourceforge/owlapi/owlapi/maven-metadata-local.xml</exclude>
+
<exclude>src/main/resources/maven/repo/net/sourceforge/owlapi/owlapi/3.2.3/owlapi-3.2.3.pom</exclude>
+
<exclude>src/main/resources/maven/repo/net/sourceforge/owlapi/owlapi/3.2.3/owlapi-3.2.3.jar</exclude>
+
<exclude>src/main/resources/maven/repo/net/sourceforge/owlapi/owlapi/3.2.3/owlapi-3.2.3-sources.jar</exclude>
</excludes>
</configuration>
</plugin>
@@ -147,6 +147,7 @@
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi</artifactId>
+ <version>3.2.3</version>
</dependency>
<!-- Persistence deps -->
Modified: incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml?rev=1353670&r1=1353669&r2=1353670&view=diff
==============================================================================
--- incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml (original)
+++ incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml Mon Jun 25
17:19:54 2012
@@ -57,19 +57,16 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
<groupId>hermit</groupId>
<artifactId>hermit</artifactId>
<version>1.3.6</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.owlapi</groupId>
- <artifactId>owlapi</artifactId>
+ <exclusions>
+ <exclusion><!-- we want to use net.sourceforge.owlapi:owlapi:3.2.3 -->
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jautomata</groupId>
@@ -87,50 +84,50 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
- </dependency>
- <!-- Dependencies for test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- osgi dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Stanbol dependencies -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Dependencies for test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- osgi dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol dependencies -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1353670&r1=1353669&r2=1353670&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Mon Jun 25 17:19:54 2012
@@ -1119,12 +1119,13 @@
<version>3.0.0</version>
</dependency>
- <!-- OWL -->
+ <!-- OWL
+ directly defined in the org.apache.stanbol.commons.owl POM
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi</artifactId>
<version>3.2.3</version>
- </dependency>
+ </dependency> -->
<!-- see also lucene-xercesImpl -->
<dependency>
<groupId>xerces</groupId>
