aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1730874 - in /aries/trunk: pom.xml tx-control/pom.xml
Date Wed, 17 Feb 2016 16:57:31 GMT
Author: timothyjward
Date: Wed Feb 17 16:57:30 2016
New Revision: 1730874

URL: http://svn.apache.org/viewvc?rev=1730874&view=rev
Log:
[tx-control] Add tx-control to the main build, but require Java 8 to build it

Modified:
    aries/trunk/pom.xml
    aries/trunk/tx-control/pom.xml

Modified: aries/trunk/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/pom.xml?rev=1730874&r1=1730873&r2=1730874&view=diff
==============================================================================
--- aries/trunk/pom.xml (original)
+++ aries/trunk/pom.xml Wed Feb 17 16:57:30 2016
@@ -58,6 +58,7 @@
         <module>esa-ant-task</module>
         <module>esa-maven-plugin</module>
         <module>async</module>
+        <module>tx-control</module>
     </modules>
 
     <build>

Modified: aries/trunk/tx-control/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/pom.xml?rev=1730874&r1=1730873&r2=1730874&view=diff
==============================================================================
--- aries/trunk/tx-control/pom.xml (original)
+++ aries/trunk/tx-control/pom.xml Wed Feb 17 16:57:30 2016
@@ -1,42 +1,52 @@
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-    license agreements. See the NOTICE file distributed with this work for additional 
-    information regarding copyright ownership. The ASF licenses this file to 
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
-    this file except in compliance with the License. You may obtain a copy of 
-    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-    by applicable law or agreed to in writing, software distributed under the 
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-    OF ANY KIND, either express or implied. See the License for the specific 
-    language governing permissions and limitations under the License. -->
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
 <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>
-    <groupId>org.apache.aries.tx-control</groupId>
-    <artifactId>tx-control</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <description>Transaction Control service, including Resource Provider implementations.</description>
-    <scm>
-        <connection>
+	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>
+	<packaging>pom</packaging>
+	<description>Transaction Control service, including Resource Provider implementations.</description>
+	<scm>
+		<connection>
             scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control
         </connection>
-        <developerConnection>
+		<developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control
         </developerConnection>
-        <url>
+		<url>
             http://svn.apache.org/viewvc/aries/trunk/tx-control
         </url>
-    </scm>
-    <modules>
-        <module>tx-control-api</module>
-        <module>tx-control-service-local</module>
-        <module>tx-control-provider-jdbc-local</module>
-        <module>tx-control-itests</module>
-    </modules>
+	</scm>
+
+	<profiles>
+		<profile>
+			<id>jdk18</id>
+			<activation>
+				<jdk>1.8</jdk>
+			</activation>
+			<modules>
+				<module>tx-control-api</module>
+				<module>tx-control-service-local</module>
+				<module>tx-control-provider-jdbc-local</module>
+				<module>tx-control-itests</module>
+			</modules>
+		</profile>
+	</profiles>
+
 </project>
\ No newline at end of file



Mime
View raw message