Author: fchrist
Date: Tue Jan 29 12:21:05 2013
New Revision: 1439852
URL: http://svn.apache.org/viewvc?rev=1439852&view=rev
Log:
STANBOL-900 merged parent and reactor POM, updated parent to dev version
Removed:
stanbol/trunk/enhancer/parent/
Modified:
stanbol/trunk/enhancer/benchmark/pom.xml
stanbol/trunk/enhancer/chain/allactive/pom.xml
stanbol/trunk/enhancer/chain/graph/pom.xml
stanbol/trunk/enhancer/chain/list/pom.xml
stanbol/trunk/enhancer/chain/weighted/pom.xml
stanbol/trunk/enhancer/defaults/pom.xml
stanbol/trunk/enhancer/generic/core/pom.xml
stanbol/trunk/enhancer/generic/nlp-json/pom.xml
stanbol/trunk/enhancer/generic/nlp/pom.xml
stanbol/trunk/enhancer/generic/rdfentities/pom.xml
stanbol/trunk/enhancer/generic/servicesapi/pom.xml
stanbol/trunk/enhancer/generic/test/pom.xml
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jobmanager/event/pom.xml
stanbol/trunk/enhancer/jobmanager/pom.xml
stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
stanbol/trunk/enhancer/ldpath/pom.xml
stanbol/trunk/enhancer/pom.xml
Modified: stanbol/trunk/enhancer/benchmark/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/benchmark/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/benchmark/pom.xml (original)
+++ stanbol/trunk/enhancer/benchmark/pom.xml Tue Jan 29 12:21:05 2013
@@ -20,9 +20,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/chain/allactive/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/allactive/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/allactive/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/allactive/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/chain/graph/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/graph/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/graph/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/graph/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/chain/list/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/list/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/list/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/list/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/chain/weighted/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/weighted/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/weighted/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/weighted/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/defaults/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/defaults/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/defaults/pom.xml (original)
+++ stanbol/trunk/enhancer/defaults/pom.xml Tue Jan 29 12:21:05 2013
@@ -20,9 +20,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/generic/core/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/core/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/core/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/core/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/generic/nlp-json/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp-json/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/nlp-json/pom.xml Tue Jan 29 12:21:05 2013
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp.json</artifactId>
Modified: stanbol/trunk/enhancer/generic/nlp/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/nlp/pom.xml Tue Jan 29 12:21:05 2013
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
Modified: stanbol/trunk/enhancer/generic/rdfentities/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/rdfentities/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/rdfentities/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/rdfentities/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/pom.xml Tue Jan 29 12:21:05 2013
@@ -16,9 +16,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/generic/test/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/test/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/test/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/test/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Tue Jan 29 12:21:05 2013
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/jobmanager/event/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jobmanager/event/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jobmanager/event/pom.xml (original)
+++ stanbol/trunk/enhancer/jobmanager/event/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/jobmanager/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jobmanager/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jobmanager/pom.xml (original)
+++ stanbol/trunk/enhancer/jobmanager/pom.xml Tue Jan 29 12:21:05 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml (original)
+++ stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml Tue Jan 29
12:21:05 2013
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/ldpath/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/ldpath/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/ldpath/pom.xml (original)
+++ stanbol/trunk/enhancer/ldpath/pom.xml Tue Jan 29 12:21:05 2013
@@ -21,9 +21,9 @@
<parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>apache-stanbol-enhancer</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/pom.xml?rev=1439852&r1=1439851&r2=1439852&view=diff
==============================================================================
--- stanbol/trunk/enhancer/pom.xml (original)
+++ stanbol/trunk/enhancer/pom.xml Tue Jan 29 12:21:05 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Enhancer</name>
@@ -57,8 +57,24 @@
<url>http://stanbol.apache.org/</url>
</scm>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Stanbol Enhancer</Bundle-Category>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<modules>
- <module>parent</module>
<module>generic/servicesapi</module>
<module>generic/core</module>
<module>generic/test</module>
