You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2014/05/30 21:21:05 UTC
svn commit: r1598705 - in /aries/trunk/transaction: ./ transaction-blueprint/
transaction-blueprint/src/test/java/org/apache/aries/transaction/
transaction-itests/ transaction-jdbc/ transaction-jms/ transaction-manager/
transaction-testbundle/ transact...
Author: jbonofre
Date: Fri May 30 19:21:04 2014
New Revision: 1598705
URL: http://svn.apache.org/r1598705
Log:
Merge branch 'ARIES-1006' into trunk
Modified:
aries/trunk/transaction/pom.xml
aries/trunk/transaction/transaction-blueprint/pom.xml
aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
aries/trunk/transaction/transaction-itests/pom.xml
aries/trunk/transaction/transaction-jdbc/pom.xml
aries/trunk/transaction/transaction-jms/pom.xml
aries/trunk/transaction/transaction-manager/pom.xml
aries/trunk/transaction/transaction-testbundle/pom.xml
aries/trunk/transaction/transaction-testds/pom.xml
Modified: aries/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/pom.xml (original)
+++ aries/trunk/transaction/pom.xml Fri May 30 19:21:04 2014
@@ -19,14 +19,15 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>transaction</artifactId>
<packaging>pom</packaging>
Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri May 30 19:21:04 2014
@@ -1,29 +1,33 @@
<?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.
- -->
+ 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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.blueprint</artifactId>
<packaging>bundle</packaging>
@@ -32,14 +36,12 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint
- </developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-blueprint</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint</url>
</scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.transaction.exception,
org.apache.aries.transaction.annotations
@@ -54,7 +56,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -110,7 +111,8 @@
<goal>version-check</goal>
</goals>
<configuration>
- <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1</oldArtifact>
+ <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.blueprint:1.0.1
+ </oldArtifact>
</configuration>
</execution>
</executions>
Modified: aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java (original)
+++ aries/trunk/transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java Fri May 30 19:21:04 2014
@@ -21,6 +21,7 @@ package org.apache.aries.transaction;
import java.net.URI;
import java.net.URL;
import java.util.Arrays;
+import java.util.Dictionary;
import java.util.Properties;
import java.util.Set;
@@ -76,7 +77,7 @@ public class BaseNameSpaceHandlerSetup {
Properties props = new Properties();
props.put("osgi.service.blueprint.namespace", new String[]{"http://aries.apache.org/xmlns/transactions/v1.0.0", "http://aries.apache.org/xmlns/transactions/v1.1.0", "http://aries.apache.org/xmlns/transactions/v1.2.0"});
- ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, props);
+ ctx.registerService(NamespaceHandler.class.getName(), namespaceHandler, (Dictionary) props);
}
@After
Modified: aries/trunk/transaction/transaction-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-itests/pom.xml (original)
+++ aries/trunk/transaction/transaction-itests/pom.xml Fri May 30 19:21:04 2014
@@ -18,30 +18,33 @@
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">
- <modelVersion>4.0.0</modelVersion>
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.itests</artifactId>
- <name>Apache Aries Transaction Integration Tests</name>
- <version>1.0.1-SNAPSHOT</version>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests</url>
- </scm>
-
+
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.itests</artifactId>
+ <name>Apache Aries Transaction Integration Tests</name>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests</url>
+ </scm>
+
<properties>
<exam.version>3.4.0</exam.version>
<url.version>1.6.0</url.version>
</properties>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -90,24 +93,24 @@
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.testsupport</groupId>
- <artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>org.apache.aries.testsupport</groupId>
+ <artifactId>org.apache.aries.testsupport.unit</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.0.v20120529-1548</version>
</dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
- <scope>test</scope>
- <version>4.0</version>
- </dependency>
-
- <!-- pax exam -->
+ <scope>test</scope>
+ <version>4.0</version>
+ </dependency>
+
+ <!-- pax exam -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -160,10 +163,10 @@
<artifactId>tinybundles</artifactId>
<version>2.0.0</version>
<exclusions>
- <exclusion>
- <artifactId>org.osgi.core</artifactId>
- <groupId>org.osgi</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>org.osgi.core</artifactId>
+ <groupId>org.osgi</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -172,53 +175,56 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
- <profile>
- <id>ci-build-profile</id>
- <activation>
- <property>
- <name>maven.repo.local</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!--
- when the local repo location has been specified, we need to pass
- on this information to PAX mvn url
- -->
- <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profile>
+ <id>ci-build-profile</id>
+ <activation>
+ <property>
+ <name>maven.repo.local</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <!--
+ when the local repo location has been specified, we need to pass
+ on this information to PAX mvn url
+ -->
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: aries/trunk/transaction/transaction-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/pom.xml (original)
+++ aries/trunk/transaction/transaction-jdbc/pom.xml Fri May 30 19:21:04 2014
@@ -18,51 +18,54 @@
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">
- <modelVersion>4.0.0</modelVersion>
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.jdbc</artifactId>
- <name>Apache Aries Transaction Enlisting JDBC Datasource</name>
- <version>2.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jdbc</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jdbc</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc</url>
- </scm>
-
- <properties>
- <aries.osgi.export.pkg>
- org.apache.aries.transaction.jdbc;-noimport:=true;version="2.0",
- javax.resource*;version="1.6.0",
- </aries.osgi.export.pkg>
- <aries.osgi.import>
- org.osgi.service.blueprint;resolution:=optional,
- javax.validation;resolution:=optional,
- *
- </aries.osgi.import>
- <aries.osgi.private.pkg>
- org.apache.aries.transaction.jdbc.internal,
- org.apache.geronimo.connector*,
- org.tranql*,
- </aries.osgi.private.pkg>
- <aries.osgi.activator>
- org.apache.aries.transaction.jdbc.internal.Activator
- </aries.osgi.activator>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.manager</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </dependency>
+
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.jdbc</artifactId>
+ <name>Apache Aries Transaction Enlisting JDBC Datasource</name>
+ <version>2.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jdbc</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jdbc</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc</url>
+ </scm>
+
+ <properties>
+ <aries.osgi.export.pkg>
+ org.apache.aries.transaction.jdbc;-noimport:=true;version="2.0",
+ javax.resource*;version="1.6.0",
+ </aries.osgi.export.pkg>
+ <aries.osgi.import>
+ org.osgi.service.blueprint;resolution:=optional,
+ javax.validation;resolution:=optional,
+ *
+ </aries.osgi.import>
+ <aries.osgi.private.pkg>
+ org.apache.aries.transaction.jdbc.internal,
+ org.apache.geronimo.connector*,
+ org.tranql*,
+ </aries.osgi.private.pkg>
+ <aries.osgi.activator>
+ org.apache.aries.transaction.jdbc.internal.Activator
+ </aries.osgi.activator>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.manager</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
@@ -83,31 +86,31 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- <version>1.8</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>3.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.core</artifactId>
- <version>1.0.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-blueprint</artifactId>
- <version>3.7</version>
- <optional>true</optional>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <version>1.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>3.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>1.0.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-blueprint</artifactId>
+ <version>3.7</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
@@ -118,7 +121,7 @@
<version>1.7</version>
<optional>true</optional>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -149,11 +152,13 @@
<goal>version-check</goal>
</goals>
<configuration>
- <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jdbc:1.0.0</oldArtifact>
+ <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jdbc:1.0.0
+ </oldArtifact>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/transaction/transaction-jms/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/pom.xml (original)
+++ aries/trunk/transaction/transaction-jms/pom.xml Fri May 30 19:21:04 2014
@@ -19,25 +19,27 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.jms</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMS Pool</name>
<version>1.0.1-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jms</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jms</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jms</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-jms</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms</url>
+ </scm>
+
<properties>
<aries.osgi.export>
org.apache.aries.transaction.jms;version="1.0.0";-noimport:=true
@@ -91,7 +93,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -125,7 +126,8 @@
<goal>version-check</goal>
</goals>
<configuration>
- <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jms:1.0.0</oldArtifact>
+ <oldArtifact>org.apache.aries.transaction:org.apache.aries.transaction.jms:1.0.0
+ </oldArtifact>
</configuration>
</execution>
</executions>
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri May 30 19:21:04 2014
@@ -23,21 +23,22 @@
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
<version>1.0.0</version>
- <relativePath />
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
<packaging>bundle</packaging>
- <name>Apache Aries Transaction Manager</name>
+ <name>Apache Aries Transaction Manager</name>
<version>1.1.1-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-manager
+ </developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager</url>
+ </scm>
<properties>
<aries.osgi.export>
org.apache.geronimo.transaction.manager;version="3.0";provide:=true,
@@ -167,7 +168,7 @@
<configuration>
<tasks>
<copy todir="${project.build.directory}/sources">
- <fileset dir="${basedir}/src/main/java" />
+ <fileset dir="${basedir}/src/main/java"/>
</copy>
</tasks>
</configuration>
Modified: aries/trunk/transaction/transaction-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testbundle/pom.xml (original)
+++ aries/trunk/transaction/transaction-testbundle/pom.xml Fri May 30 19:21:04 2014
@@ -18,34 +18,37 @@
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">
- <modelVersion>4.0.0</modelVersion>
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.testbundle</artifactId>
- <packaging>bundle</packaging>
- <version>1.0.1-SNAPSHOT</version>
- <name>Apache Aries Transaction Test Bundle</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testbundle</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testbundle</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle</url>
- </scm>
-
- <properties>
- <!-- Export package versions are maintained in packageinfo files -->
-
- <aries.osgi.export.pkg>
- org.apache.aries.transaction.test
- </aries.osgi.export.pkg>
- <aries.osgi.private.pkg>
- org.apache.aries.transaction.test.impl
- </aries.osgi.private.pkg>
- </properties>
+
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.testbundle</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>Apache Aries Transaction Test Bundle</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testbundle</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testbundle</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testbundle</url>
+ </scm>
+
+ <properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+
+ <aries.osgi.export.pkg>
+ org.apache.aries.transaction.test
+ </aries.osgi.export.pkg>
+ <aries.osgi.private.pkg>
+ org.apache.aries.transaction.test.impl
+ </aries.osgi.private.pkg>
+ </properties>
</project>
Modified: aries/trunk/transaction/transaction-testds/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testds/pom.xml?rev=1598705&r1=1598704&r2=1598705&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-testds/pom.xml (original)
+++ aries/trunk/transaction/transaction-testds/pom.xml Fri May 30 19:21:04 2014
@@ -1,49 +1,56 @@
<?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.
- -->
+<!--
+ 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
- </parent>
- <groupId>org.apache.aries.transaction</groupId>
- <artifactId>org.apache.aries.transaction.testds</artifactId>
- <name>Apache Aries Transaction Test Datasource Configuration</name>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.testds</artifactId>
+ <name>Apache Aries Transaction Test Datasource Configuration</name>
<version>1.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <packaging>bundle</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testds</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testds</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testds</url>
+ </scm>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testds</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/transaction/transaction-testds</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-testds</url>
- </scm>
-
- <properties>
- <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
- <aries.osgi.private.pkg />
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <properties>
+ <aries.osgi.export.pkg>${project.artifactId}*</aries.osgi.export.pkg>
+ <aries.osgi.private.pkg/>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<version>10.5.3.0_1</version>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
+
</project>