[jboss-svn-commits] JBoss Common SVN: r2499 - common-core/trunk and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 16 15:10:45 EDT 2007
Author: pgier
Date: 2007-08-16 15:10:45 -0400 (Thu, 16 Aug 2007)
New Revision: 2499
Added:
common-core/trunk/pom-jdk14.xml
common-logging-jdk/trunk/pom-jdk14.xml
common-logging-log4j/trunk/pom-jdk14.xml
common-logging-spi/trunk/pom-jdk14.xml
Modified:
build/trunk/
common-core/trunk/pom.xml
common-logging-jdk/trunk/pom.xml
common-logging-log4j/trunk/pom.xml
common-logging-spi/trunk/pom.xml
Log:
Adding new poms for jdk14 builds.
Property changes on: build/trunk
___________________________________________________________________
Name: svn:ignore
- target
local.properties
+ target
local.properties
assembly
backup
Added: common-core/trunk/pom-jdk14.xml
===================================================================
--- common-core/trunk/pom-jdk14.xml (rev 0)
+++ common-core/trunk/pom-jdk14.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Notes for building and running tests.
+ - Do to some limitations of the maven surefire plugin, the tests must
+ - occur in a separate lifecycle from the build.
+ -
+ - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
+ - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+ -->
+<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">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-common-core-jdk14</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>JBoss Common Classes</name>
+ <url>http://www.jboss.org</url>
+ <description>JBoss Common Core Utility classes</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/common/common-core/trunk</connection>
+ </scm>
+ <build>
+ <outputDirectory>${mainOutputDir}</outputDirectory>
+ <testOutputDirectory>${testOutputDir}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The tagBase property is needed during the release process so that the maven release plugin
+ will create the release tag in the appropriate location. -->
+ <tagBase>https://svn.jboss.org/repos/common/common-core/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-deploy-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-retro-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>weave-classes</id>
+ <goals>
+ <goal>weave</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-test-classes</id>
+ <goals>
+ <goal>weave-tests</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Skip the tests here because the jdk14 tests have
+ - to run the tests in a separate profile.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test-jdk14</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core-jdk14</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-backport-concurrent</artifactId>
+ <version>2.1.0.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-retro</artifactId>
+ <version>1.1.2</version>
+ <classifier>rt</classifier>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+ - of the lifecycle. In other words it should be called directly from the command
+ - line like this
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+ -->
+ <profile>
+ <id>run-jdk14-tests</id>
+ <properties>
+ <mainOutputDir>target/classes-jdk14</mainOutputDir>
+ <testOutputDir>target/test-classes-jdk14</testOutputDir>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-jdk14-property</id>
+ <goals>
+ <goal>enforce-once</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>java14_home</property>
+ <message>
+ The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
+ </message>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${java14_home}/bin/java</jvm>
+ <forkMode>always</forkMode>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <mainOutputDir>target/classes</mainOutputDir>
+ <testOutputDir>target/test-classes</testOutputDir>
+ </properties>
+
+</project>
Modified: common-core/trunk/pom.xml
===================================================================
--- common-core/trunk/pom.xml 2007-08-15 16:56:04 UTC (rev 2498)
+++ common-core/trunk/pom.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.jboss</groupId>
@@ -65,11 +66,6 @@
<version>2.0.2</version>
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
<groupId>apache-slide</groupId>
<artifactId>webdavlib</artifactId>
<version>2.0</version>
@@ -98,4 +94,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Added: common-logging-jdk/trunk/pom-jdk14.xml
===================================================================
--- common-logging-jdk/trunk/pom-jdk14.xml (rev 0)
+++ common-logging-jdk/trunk/pom-jdk14.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Notes for building and running tests.
+ - Do to some limitations of the maven surefire plugin, the tests must
+ - occur in a separate lifecycle from the build.
+ -
+ - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
+ - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+ -->
+<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">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-common-logging-jdk-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>JBoss Logging JDK</name>
+ <url>http://www.jboss.org</url>
+ <description>JBoss Common Logging JDK Implementation</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/common/common-logging-jdk/trunk/</connection>
+ </scm>
+ <build>
+ <outputDirectory>${mainOutputDir}</outputDirectory>
+ <testOutputDirectory>${testOutputDir}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The tagBase property is needed during the release process so that the maven release plugin
+ will create the release tag in the appropriate location. -->
+ <tagBase>https://svn.jboss.org/repos/common/common-logging-jdk/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-deploy-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-retro-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>weave-classes</id>
+ <goals>
+ <goal>weave</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-test-classes</id>
+ <goals>
+ <goal>weave-tests</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Skip the tests here because the jdk14 tests have
+ - to run the tests in a separate profile.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core-jdk14</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-backport-concurrent</artifactId>
+ <version>2.1.0.GA</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-retro</artifactId>
+ <version>1.1.2</version>
+ <classifier>rt</classifier>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+ - of the lifecycle. In other words it should be called directly from the command
+ - line like this
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+ -->
+ <profile>
+ <id>run-jdk14-tests</id>
+ <properties>
+ <mainOutputDir>target/classes-jdk14</mainOutputDir>
+ <testOutputDir>target/test-classes-jdk14</testOutputDir>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-jdk14-property</id>
+ <goals>
+ <goal>enforce-once</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>java14_home</property>
+ <message>
+ The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
+ </message>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${java14_home}/bin/java</jvm>
+ <forkMode>always</forkMode>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <mainOutputDir>target/classes</mainOutputDir>
+ <testOutputDir>target/test-classes</testOutputDir>
+ </properties>
+
+</project>
Modified: common-logging-jdk/trunk/pom.xml
===================================================================
--- common-logging-jdk/trunk/pom.xml 2007-08-15 16:56:04 UTC (rev 2498)
+++ common-logging-jdk/trunk/pom.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.jboss</groupId>
@@ -55,7 +56,7 @@
</repositories>
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
<version>2.0.5-SNAPSHOT</version>
</dependency>
Added: common-logging-log4j/trunk/pom-jdk14.xml
===================================================================
--- common-logging-log4j/trunk/pom-jdk14.xml (rev 0)
+++ common-logging-log4j/trunk/pom-jdk14.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Notes for building and running tests.
+ - Do to some limitations of the maven surefire plugin, the tests must
+ - occur in a separate lifecycle from the build.
+ -
+ - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
+ - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+ -->
+<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">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-common-logging-log4j-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>JBoss Logging Log4j</name>
+ <url>http://www.jboss.org</url>
+ <description>JBoss Common Logging Log4j Implementation</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/common/common-logging-log4j/trunk/</connection>
+ </scm>
+ <build>
+ <outputDirectory>${mainOutputDir}</outputDirectory>
+ <testOutputDirectory>${testOutputDir}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The tagBase property is needed during the release process so that the maven release plugin
+ will create the release tag in the appropriate location. -->
+ <tagBase>https://svn.jboss.org/repos/common/common-logging-log4j/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-deploy-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-retro-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>weave-classes</id>
+ <goals>
+ <goal>weave</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-test-classes</id>
+ <goals>
+ <goal>weave-tests</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Skip the tests here because the jdk14 tests have
+ - to run the tests in a separate profile.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core-jdk14</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+ - of the lifecycle. In other words it should be called directly from the command
+ - line like this
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+ -->
+ <profile>
+ <id>run-jdk14-tests</id>
+ <properties>
+ <mainOutputDir>target/classes-jdk14</mainOutputDir>
+ <testOutputDir>target/test-classes-jdk14</testOutputDir>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-jdk14-property</id>
+ <goals>
+ <goal>enforce-once</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>java14_home</property>
+ <message>
+ The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
+ </message>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${java14_home}/bin/java</jvm>
+ <forkMode>always</forkMode>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <mainOutputDir>target/classes</mainOutputDir>
+ <testOutputDir>target/test-classes</testOutputDir>
+ </properties>
+
+</project>
Modified: common-logging-log4j/trunk/pom.xml
===================================================================
--- common-logging-log4j/trunk/pom.xml 2007-08-15 16:56:04 UTC (rev 2498)
+++ common-logging-log4j/trunk/pom.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.jboss</groupId>
@@ -55,7 +56,7 @@
</repositories>
<dependencies>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
<version>2.0.5-SNAPSHOT</version>
</dependency>
@@ -63,6 +64,12 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>2.0.4.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
Added: common-logging-spi/trunk/pom-jdk14.xml
===================================================================
--- common-logging-spi/trunk/pom-jdk14.xml (rev 0)
+++ common-logging-spi/trunk/pom-jdk14.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Notes for building and running tests.
+ - Do to some limitations of the maven surefire plugin, the tests must
+ - occur in a separate lifecycle from the build.
+ -
+ - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
+ - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
+ -->
+<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">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-common-logging-spi-jdk14</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>JBoss Logging Programming Interface</name>
+ <url>http://www.jboss.org</url>
+ <description>The JBoss Logging Framework Programming Interface</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/common/common-logging-spi/trunk/</connection>
+ </scm>
+ <build>
+ <outputDirectory>${mainOutputDir}</outputDirectory>
+ <testOutputDirectory>${testOutputDir}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The tagBase property is needed during the release process so that the maven release plugin
+ will create the release tag in the appropriate location. -->
+ <tagBase>https://svn.jboss.org/repos/common/common-logging-spi/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>jboss.maven-plugins</groupId>
+ <artifactId>jboss-deploy-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-retro-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>weave-classes</id>
+ <goals>
+ <goal>weave</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-test-classes</id>
+ <goals>
+ <goal>weave-tests</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Skip the tests here because the jdk14 tests have
+ - to run the tests in a separate profile.
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
+ - of the lifecycle. In other words it should be called directly from the command
+ - line like this
+ - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
+ -->
+ <profile>
+ <id>run-jdk14-tests</id>
+ <properties>
+ <mainOutputDir>target/classes-jdk14</mainOutputDir>
+ <testOutputDir>target/test-classes-jdk14</testOutputDir>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-jdk14-property</id>
+ <goals>
+ <goal>enforce-once</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>java14_home</property>
+ <message>
+ The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
+ </message>
+ </requireProperty>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <jvm>${java14_home}/bin/java</jvm>
+ <forkMode>always</forkMode>
+ <skip>false</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <mainOutputDir>target/classes</mainOutputDir>
+ <testOutputDir>target/test-classes</testOutputDir>
+ </properties>
+
+</project>
\ No newline at end of file
Property changes on: common-logging-spi/trunk/pom-jdk14.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: common-logging-spi/trunk/pom.xml
===================================================================
--- common-logging-spi/trunk/pom.xml 2007-08-15 16:56:04 UTC (rev 2498)
+++ common-logging-spi/trunk/pom.xml 2007-08-16 19:10:45 UTC (rev 2499)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<groupId>org.jboss</groupId>
More information about the jboss-svn-commits
mailing list