[tx-control] Move to an internal parent for setting things like JavaDoc JDK version
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/tx-control@1748607 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index fb5aeaf..9715a4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,14 +24,14 @@
<description>Transaction Control service, including Resource Provider implementations.</description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control
- </connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control
+ </connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control
- </developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control
+ </developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/tx-control
- </url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control
+ </url>
</scm>
<profiles>
@@ -56,4 +56,40 @@
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.aries.versioning</groupId>
+ <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>version-check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/tx-control-api/pom.xml b/tx-control-api/pom.xml
index 29292bc..89161b5 100644
--- a/tx-control-api/pom.xml
+++ b/tx-control-api/pom.xml
@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-api</artifactId>
diff --git a/tx-control-itests/pom.xml b/tx-control-itests/pom.xml
index f524f64..899820a 100644
--- a/tx-control-itests/pom.xml
+++ b/tx-control-itests/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>org.apache.aries.tx-control-itests</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/tx-control-jpa-itests/pom.xml b/tx-control-jpa-itests/pom.xml
index 7119389..06cd0dc 100644
--- a/tx-control-jpa-itests/pom.xml
+++ b/tx-control-jpa-itests/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>org.apache.aries.tx-control-jpa-itests</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/tx-control-provider-jdbc-common/pom.xml b/tx-control-provider-jdbc-common/pom.xml
index c906cf8..257154f 100644
--- a/tx-control-provider-jdbc-common/pom.xml
+++ b/tx-control-provider-jdbc-common/pom.xml
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-common</artifactId>
<packaging>jar</packaging>
diff --git a/tx-control-provider-jdbc-local/pom.xml b/tx-control-provider-jdbc-local/pom.xml
index 2695549..ef60185 100644
--- a/tx-control-provider-jdbc-local/pom.xml
+++ b/tx-control-provider-jdbc-local/pom.xml
@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-local</artifactId>
@@ -140,16 +140,16 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- <configuration>
- <instructions>
- <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc",osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc"</Provide-Capability>
- <Require-Capability>osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active"</Require-Capability>
- </instructions>
- </configuration>
- </plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc",osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc"</Provide-Capability>
+ <Require-Capability>osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active"</Require-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/tx-control-provider-jdbc-xa/pom.xml b/tx-control-provider-jdbc-xa/pom.xml
index 9d87d59..bc6760e 100644
--- a/tx-control-provider-jdbc-xa/pom.xml
+++ b/tx-control-provider-jdbc-xa/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-xa</artifactId>
<packaging>bundle</packaging>
diff --git a/tx-control-provider-jpa-local/pom.xml b/tx-control-provider-jpa-local/pom.xml
index e52fa05..f575e94 100644
--- a/tx-control-provider-jpa-local/pom.xml
+++ b/tx-control-provider-jpa-local/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-local</artifactId>
<packaging>bundle</packaging>
diff --git a/tx-control-provider-jpa-xa/pom.xml b/tx-control-provider-jpa-xa/pom.xml
index dd60063..d0baa6a 100644
--- a/tx-control-provider-jpa-xa/pom.xml
+++ b/tx-control-provider-jpa-xa/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa</artifactId>
<packaging>bundle</packaging>
diff --git a/tx-control-service-common/pom.xml b/tx-control-service-common/pom.xml
index ebc93d0..6edbfc2 100644
--- a/tx-control-service-common/pom.xml
+++ b/tx-control-service-common/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-common</artifactId>
<name>OSGi Transaction Control Service - Common Code</name>
diff --git a/tx-control-service-local/pom.xml b/tx-control-service-local/pom.xml
index fa00e4f..e4e2c3c 100644
--- a/tx-control-service-local/pom.xml
+++ b/tx-control-service-local/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-local</artifactId>
<packaging>bundle</packaging>
diff --git a/tx-control-service-xa/pom.xml b/tx-control-service-xa/pom.xml
index 0833531..f95fea7 100644
--- a/tx-control-service-xa/pom.xml
+++ b/tx-control-service-xa/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-xa</artifactId>
<packaging>bundle</packaging>