Author: gnodet
Date: Wed Oct 7 14:15:16 2009
New Revision: 822749
URL: http://svn.apache.org/viewvc?rev=822749&view=rev
Log:
ARIES-20: Update poms to include the transaction component in the build and use
correct version / parent etc...
Modified:
incubator/aries/trunk/pom.xml
incubator/aries/trunk/transaction/pom.xml
Modified: incubator/aries/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/pom.xml?rev=822749&r1=822748&r2=822749&view=diff
==============================================================================
--- incubator/aries/trunk/pom.xml (original)
+++ incubator/aries/trunk/pom.xml Wed Oct 7 14:15:16 2009
@@ -40,6 +40,7 @@
<module>testsupport</module>
<module>blueprint</module>
<module>jndi</module>
+ <module>transaction</module>
</modules>
</project>
Modified: incubator/aries/trunk/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/pom.xml?rev=822749&r1=822748&r2=822749&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/pom.xml (original)
+++ incubator/aries/trunk/transaction/pom.xml Wed Oct 7 14:15:16 2009
@@ -1,36 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<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/maven-v4_0_0.xsd";>
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>nmr-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>java5-parent</artifactId>
+ <version>1.0.0-incubating-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.transaction</groupId>
- <artifactId>org.apache.servicemix.transaction</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>aries-transaction</artifactId>
<packaging>bundle</packaging>
- <name>Apache ServiceMix Transaction</name>
+ <name>Apache Aries Transaction</name>
<properties>
<geronimo-transaction-version>2.1.3</geronimo-transaction-version>
@@ -38,15 +37,15 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.2.0</version>
+ <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
+ <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -70,16 +69,9 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
