GERONIMO-3344 tie new subprojects together with a parent pom
git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@559713 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-connector/pom.xml b/geronimo-connector/pom.xml
index 02d6375..958a66e 100644
--- a/geronimo-connector/pom.xml
+++ b/geronimo-connector/pom.xml
@@ -23,12 +23,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-txmanager-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Geronimo :: Connector</name>
@@ -44,46 +43,11 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.1.1</version>
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <!-- Do not include META-INF/maven to avoid long file problems on windows -->
- <addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
+ <build><!--
<plugins>
<plugin>
@@ -97,12 +61,12 @@
</goals>
<configuration>
<rules>
- <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+ --><!-- Allow any Java >= 1.5, but not 1.6 or above --><!--
<requireJavaVersion>
<version>[1.5,1.6)</version>
</requireJavaVersion>
- <!-- Allow any Maven >= 2.0.5 -->
+ --><!-- Allow any Maven >= 2.0.5 --><!--
<requireMavenVersion>
<version>[2.0.5,)</version>
</requireMavenVersion>
@@ -116,7 +80,7 @@
<groupId>org.apache.geronimo.genesis.plugins</groupId>
<artifactId>tools-maven-plugin</artifactId>
- <!-- Tools includes custom packagings, install as extension to pick them up -->
+ --><!-- Tools includes custom packagings, install as extension to pick them up --><!--
<extensions>true</extensions>
<executions>
@@ -127,7 +91,7 @@
<goal>copy-legal-files</goal>
</goals>
<configuration>
- <!-- Fail the build if no legal files were copied -->
+ --><!-- Fail the build if no legal files were copied --><!--
<strict>true</strict>
</configuration>
</execution>
@@ -139,8 +103,8 @@
<goal>verify-legal-files</goal>
</goals>
<configuration>
- <!-- Fail the build if no legal files were found -->
- <!--<strict>true</strict>-->
+ --><!-- Fail the build if no legal files were found --><!--
+ --><!--<strict>true</strict>--><!--
<strict>false</strict>
</configuration>
</execution>
@@ -174,7 +138,7 @@
</configuration>
</plugin>
</plugins>
- </build>
+ --></build>
</project>
diff --git a/geronimo-transaction/pom.xml b/geronimo-transaction/pom.xml
index 97e8565..a122c59 100644
--- a/geronimo-transaction/pom.xml
+++ b/geronimo-transaction/pom.xml
@@ -24,12 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.genesis.config</groupId>
- <artifactId>project-config</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-txmanager-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Geronimo :: Transaction</name>
@@ -39,25 +38,21 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
- <version>1.0.1-1</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..b2c929e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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.geronimo.genesis.config</groupId>
+ <artifactId>project-config</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-txmanager-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Geronimo :: TxManager :: Parent</name>
+
+ <modules>
+ <module>geronimo-transaction</module>
+ <module>geronimo-connector</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.objectweb.howl</groupId>
+ <artifactId>howl</artifactId>
+ <version>1.0.1-1</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-4</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <!-- Allow any Java >= 1.5, but not 1.6 or above -->
+ <requireJavaVersion>
+ <version>[1.5,1.6)</version>
+ </requireJavaVersion>
+
+ <!-- Allow any Maven >= 2.0.5 -->
+ <requireMavenVersion>
+ <version>[2.0.5,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <!-- Tools includes custom packagings, install as extension to pick them up -->
+ <extensions>true</extensions>
+
+ <executions>
+ <execution>
+ <id>install-legal-files</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were copied -->
+ <strict>true</strict>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <!-- Fail the build if no legal files were found -->
+ <!--<strict>true</strict>-->
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <jdkLevel>1.5</jdkLevel>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/geronimo/components/txmanager/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
