aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1748607 - in /aries/trunk/tx-control: ./ tx-control-api/ tx-control-itests/ tx-control-jpa-itests/ tx-control-provider-jdbc-common/ tx-control-provider-jdbc-local/ tx-control-provider-jdbc-xa/ tx-control-provider-jpa-local/ tx-control-prov...
Date Wed, 15 Jun 2016 16:36:57 GMT
Author: timothyjward
Date: Wed Jun 15 16:36:56 2016
New Revision: 1748607

URL: http://svn.apache.org/viewvc?rev=1748607&view=rev
Log:
[tx-control] Move to an internal parent for setting things like JavaDoc JDK version

Modified:
    aries/trunk/tx-control/pom.xml
    aries/trunk/tx-control/tx-control-api/pom.xml
    aries/trunk/tx-control/tx-control-itests/pom.xml
    aries/trunk/tx-control/tx-control-jpa-itests/pom.xml
    aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml
    aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml
    aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml
    aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml
    aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml
    aries/trunk/tx-control/tx-control-service-common/pom.xml
    aries/trunk/tx-control/tx-control-service-local/pom.xml
    aries/trunk/tx-control/tx-control-service-xa/pom.xml

Modified: aries/trunk/tx-control/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/pom.xml (original)
+++ aries/trunk/tx-control/pom.xml Wed Jun 15 16:36:56 2016
@@ -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

Modified: aries/trunk/tx-control/tx-control-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-api/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-api/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-api/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-itests/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-itests/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-itests/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-jpa-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-jpa-itests/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-jpa-itests/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-jpa-itests/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml Wed Jun 15 16:36:56 2016
@@ -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

Modified: aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jpa-local/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-service-common/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-common/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-common/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-service-common/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-service-local/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-local/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-service-local/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>

Modified: aries/trunk/tx-control/tx-control-service-xa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-xa/pom.xml?rev=1748607&r1=1748606&r2=1748607&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-service-xa/pom.xml Wed Jun 15 16:36:56 2016
@@ -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>



Mime
View raw message