You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/07/26 23:11:09 UTC
svn commit: r559977 - in /geronimo/components/txmanager/trunk:
geronimo-connector/pom.xml geronimo-transaction/pom.xml pom.xml
Author: jdillon
Date: Thu Jul 26 14:11:08 2007
New Revision: 559977
URL: http://svn.apache.org/viewvc?view=rev&rev=559977
Log:
Fix up some pom config, update version, blah, blah, blah
Modified:
geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
geronimo/components/txmanager/trunk/pom.xml
Modified: geronimo/components/txmanager/trunk/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/pom.xml?view=diff&rev=559977&r1=559976&r2=559977
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/pom.xml Thu Jul 26 14:11:08 2007
@@ -29,11 +29,9 @@
</parent>
<artifactId>geronimo-connector</artifactId>
- <version>2.0-SNAPSHOT</version>
- <name>Geronimo :: Connector</name>
+ <name>Geronimo TxManager :: Connector</name>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
@@ -44,101 +42,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
-
</dependencies>
-
- <build><!--
-
- <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>
Modified: geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml?view=diff&rev=559977&r1=559976&r2=559977
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml (original)
+++ geronimo/components/txmanager/trunk/geronimo-transaction/pom.xml Thu Jul 26 14:11:08 2007
@@ -18,8 +18,7 @@
<!-- $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">
+<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>
@@ -30,11 +29,9 @@
</parent>
<artifactId>geronimo-transaction</artifactId>
- <version>2.0-SNAPSHOT</version>
- <name>Geronimo :: Transaction</name>
+ <name>Geronimo TxManager :: Transaction</name>
<dependencies>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -54,7 +51,6 @@
<groupId>org.objectweb.howl</groupId>
<artifactId>howl</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/components/txmanager/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/pom.xml?view=diff&rev=559977&r1=559976&r2=559977
==============================================================================
--- geronimo/components/txmanager/trunk/pom.xml (original)
+++ geronimo/components/txmanager/trunk/pom.xml Thu Jul 26 14:11:08 2007
@@ -32,62 +32,87 @@
<artifactId>geronimo-txmanager-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Geronimo :: TxManager :: Parent</name>
+ <name>Geronimo TxManager</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk</url>
+ </scm>
+
+ <properties>
+ <!--
+ NOTE: Project version, to be used instead of ${pom.version} since that
+ value magically changes when using SNAPSHOT versions.
+
+ This value *must* be kept in sync with the value of the <version>
+ element, and it will need to be changed manually before a release,
+ as the maven-release-plugin will not update this value.
+ -->
+ <version>2.0-SNAPSHOT</version>
+ </properties>
+
+ <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>
<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>
+ <version>1.0-alpha-3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-4</version>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<archive>
<!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -95,11 +120,12 @@
</archive>
</configuration>
<executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <!-- Build *test.jar files for modules -->
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -147,7 +173,6 @@
<goal>copy-legal-files</goal>
</goals>
<configuration>
- <!-- Fail the build if no legal files were copied -->
<strict>true</strict>
</configuration>
</execution>
@@ -159,17 +184,39 @@
<goal>verify-legal-files</goal>
</goals>
<configuration>
- <!-- Fail the build if no legal files were found -->
- <!--<strict>true</strict>-->
+ <!--
+ FIXME: Need to resolve legal muck in *-test.jar files from jar:test-jar before we can make this strict again.
+ -->
<strict>false</strict>
</configuration>
</execution>
</executions>
</plugin>
-
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0-alpha-5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -179,18 +226,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
+ <version>2.1</version>
<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>