[jboss-cvs] JBossAS SVN: r96244 - in projects/javaee/trunk: build and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 10 23:29:31 EST 2009
Author: remy.maucherat at jboss.com
Date: 2009-11-10 23:29:31 -0500 (Tue, 10 Nov 2009)
New Revision: 96244
Removed:
projects/javaee/trunk/build/assembly/bin-jdk14.xml
projects/javaee/trunk/build/pom-jdk14.xml
projects/javaee/trunk/jboss-ejb-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jacc-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jad-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jaspi-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jaxr-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jca-api/pom-jdk14.xml
projects/javaee/trunk/jboss-jms-api/pom-jdk14.xml
projects/javaee/trunk/jboss-servlet-api/pom-jdk14.xml
projects/javaee/trunk/jboss-transaction-api/pom-jdk14.xml
Modified:
projects/javaee/trunk/build/pom.xml
projects/javaee/trunk/jboss-annotations-api/pom.xml
projects/javaee/trunk/jboss-ejb-api/pom.xml
projects/javaee/trunk/jboss-el-api/pom.xml
projects/javaee/trunk/jboss-jacc-api/pom.xml
projects/javaee/trunk/jboss-jad-api/pom.xml
projects/javaee/trunk/jboss-jaspi-api/pom.xml
projects/javaee/trunk/jboss-jaxr-api/pom.xml
projects/javaee/trunk/jboss-jca-api/pom.xml
projects/javaee/trunk/jboss-jms-api/pom.xml
projects/javaee/trunk/jboss-jsp-api/pom.xml
projects/javaee/trunk/jboss-servlet-api/pom.xml
projects/javaee/trunk/jboss-transaction-api/pom.xml
projects/javaee/trunk/pom.xml
Log:
- Drop some old POMs.
- Use version numbers and artifacts as in the wiki.
Deleted: projects/javaee/trunk/build/assembly/bin-jdk14.xml
===================================================================
--- projects/javaee/trunk/build/assembly/bin-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/build/assembly/bin-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,40 +0,0 @@
-<assembly>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>jboss-ejb-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-jacc-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-jad-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-jaxr-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-jca-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-jms-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-servlet-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>jboss-transaction-api/target/classes-jdk14</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Deleted: projects/javaee/trunk/build/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/build/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/build/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - The parent pom for the microcontainer project that expects a structure like:
- - build/pom.xml
- - ejb-api/pom.xml
- - transaction-api/pom.xml
- -
- - This pom aggregates the jdk14 subproject poms, and it also functions as a default
- - configuration. The subproject poms each inherit configuration from this one.
- -
- - To build this project maven 2 should be installed and in the system path.
- - From the command line run "mvn -f pom-jdk14.xml install" from the build directory to install this pom.
- -
- - For the jdk14 builds, each of the modules must be built separately:
- -
- - 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.
- -
- - To add a module edit the modules section and add the module also to
- - assembly/bin-jdk14.xml.
- -->
-<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>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss JavaEE 5.0 Build</name>
- <url>http://www.jboss.com</url>
- <description>
- The JBoss JavaEE API classes
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/javaee/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/javaee/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/javaee/trunk/</url>
- </scm>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <testSourceDirectory>src/tests</testSourceDirectory>
- <finalName>${artifactId}</finalName>
- <resources>
- <resource>
- <directory>src/etc</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- <plugins>
- <!-- define that we wish to create src jars -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>assembly/bin-jdk14.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </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>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>false</printSummary>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <!-- Skip the tests here because the jdk14 tests have
- - to run using a separate profile.
- -->
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/javaee/tags</tagBase>
- </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 Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <!-- We don't include the modules here until there is a way to call
- - all the pom-jdk14.xml files.
- -->
- <!--<modules>
- <module>../jboss-ejb-api</module>
- <module>../jboss-jacc-api</module>
- <module>../jboss-jad-api</module>
- <module>../jboss-jaxr-api</module>
- <module>../jboss-jca-api</module>
- <module>../jboss-jms-api</module>
- <module>../jboss-servlet-api</module>
- <module>../jboss-transaction-api</module>
- <module>../jboss-jaspi-api</module>
- </modules>-->
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
Modified: projects/javaee/trunk/build/pom.xml
===================================================================
--- projects/javaee/trunk/build/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/build/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss JavaEE 6.0 Parent</name>
<url>http://www.jboss.com</url>
Modified: projects/javaee/trunk/jboss-annotations-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-annotations-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-annotations-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-annotations-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-annotations-api_1.1</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Common Annotations 1.1 API</name>
+ <name>Common Annotations 1.1 API</name>
<url>http://www.jboss.org</url>
<description>The Common Annotations 1.1 API classes</description>
<reporting>
Deleted: projects/javaee/trunk/jboss-ejb-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-ejb-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-ejb-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,101 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-ejb-api-jdk14</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss EJB 3.0 API</name>
- <url>http://www.jboss.org</url>
- <description>The Java EJB 3.0 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api-jdk14</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- <version>3.0.4.GA</version>
- </dependency>
- </dependencies>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-ejb-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-ejb-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-ejb-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,22 +2,22 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss EJB 3.0 API</name>
+ <name>EJB 3.1 API</name>
<url>http://www.jboss.org</url>
- <description>The Java EJB 3.0 API classes</description>
+ <description>The Java EJB 3.1 API classes</description>
<dependencies>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-transaction-api_1.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.native</groupId>
Modified: projects/javaee/trunk/jboss-el-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-el-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-el-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,17 +2,17 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-el-api</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>jboss-el-api_1.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Expression Language 2.2 API</name>
+ <name>Expression Language 1.2 API</name>
<url>http://www.jboss.org</url>
- <description>The Expression Language 2.2 API classes</description>
+ <description>The Expression Language 1.2 API classes</description>
<reporting>
<plugins>
<plugin>
Deleted: projects/javaee/trunk/jboss-jacc-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jacc-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jacc-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,101 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-jacc-api-jdk14</artifactId>
- <version>1.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss JACC 1.1 API</name>
- <url>http://www.jboss.org</url>
- <description>The Java Authorization Contract for Containers 1.1 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>sun-servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- </dependencies>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jacc-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jacc-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jacc-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,17 +2,17 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-jacc-api_1.3</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss JACC 1.1 API</name>
+ <name>JACC 1.3 API</name>
<url>http://www.jboss.org</url>
- <description>The Java Authorization Contract for Containers 1.1 API classes</description>
+ <description>The Java Authorization Contract for Containers 1.3 API classes</description>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
@@ -20,8 +20,8 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <artifactId>jboss-servlet-api_3.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted: projects/javaee/trunk/jboss-jad-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jad-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jad-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,96 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-jad-api-jdk14</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss JavaEE Application Deployment 1.2 API</name>
- <url>http://www.jboss.org</url>
- <description>The JavaEE Application Deployment 1.2 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <dependencies>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.2.GA</version>
- </dependency>
- </dependencies>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jad-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jad-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jad-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <artifactId>jboss-jad-api_1.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss JavaEE Application Deployment 1.2 API</name>
+ <name>JavaEE Application Deployment 1.2 API</name>
<url>http://www.jboss.org</url>
<description>The JavaEE Application Deployment 1.2 API classes</description>
Deleted: projects/javaee/trunk/jboss-jaspi-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jaspi-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jaspi-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,105 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api-jdk14</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Java Authentication SPI for Containers 1.0-PR API</name>
- <url>http://www.jboss.org</url>
- <description>The Java Authentication SPI for Containers 1.0-PR API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>Java Servlet ${project.version} API Documentation</doctitle>
- <links>
- <link>http://java.sun.com/j2se/1.5/docs/api</link>
- </links>
- <windowtitle>Java Servlet ${project.version} API Documentation</windowtitle>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jaspi-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jaspi-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jaspi-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-jaspi-api_1.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Java Authentication SPI for Containers 1.0-PR API</name>
+ <name>JBoss Java Authentication SPI for Containers 1.0 API</name>
<url>http://www.jboss.org</url>
- <description>The Java Authentication SPI for Containers 1.0-PR API classes</description>
+ <description>The Java Authentication SPI for Containers 1.0 API classes</description>
</project>
\ No newline at end of file
Deleted: projects/javaee/trunk/jboss-jaxr-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jaxr-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jaxr-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,97 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaxr-api-jdk14</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Java API for XML Registries 1.0</name>
- <url>http://www.jboss.org</url>
- <description>The Java API for XML Registries 1.0 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <dependencies>
- <dependency>
- <groupId>sun-jaf</groupId>
- <artifactId>activation</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jaxr-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jaxr-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jaxr-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaxr-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>jboss-jaxr-api_1.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Java API for XML Registries 1.0</name>
+ <name>Java API for XML Registries 1.0</name>
<url>http://www.jboss.org</url>
<description>The Java API for XML Registries 1.0 API classes</description>
<dependencies>
Deleted: projects/javaee/trunk/jboss-jca-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jca-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jca-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,103 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api-jdk14</artifactId>
- <version>1.6-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss J2EE Connector Architecture 1.6 API</name>
- <url>http://www.jboss.org</url>
- <description>The J2EE Connector Architecture 1.6 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <dependencies>
- <!-- For SerialVersion -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1.GA</version>
- </dependency>
- </dependencies>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jca-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jca-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jca-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.6.0.Beta1-SNAPSHOT</version>
+ <artifactId>jboss-jca-api_1.6</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss J2EE Connector Architecture 1.6 API</name>
<url>http://www.jboss.org</url>
@@ -21,8 +21,8 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-transaction-api_1.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted: projects/javaee/trunk/jboss-jms-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-jms-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jms-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,89 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api-jdk14</artifactId>
- <version>1.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss JMS 1.1 API</name>
- <url>http://www.jboss.org</url>
- <description>The Java Messaging Service 1.1 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-jms-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jms-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jms-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-jms-api_1.1</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss JMS 1.1 API</name>
+ <name>JMS 1.1 API</name>
<url>http://www.jboss.org</url>
<description>The Java Messaging Service 1.1 API classes</description>
</project>
\ No newline at end of file
Modified: projects/javaee/trunk/jboss-jsp-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jsp-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-jsp-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jsp-api</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>jboss-jsp-api_2.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Java Server Pages 2.2 API</name>
<url>http://www.jboss.org</url>
@@ -31,13 +31,13 @@
<dependencies>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-el-api</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>jboss-el-api_1.2</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>jboss-servlet-api_3.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Deleted: projects/javaee/trunk/jboss-servlet-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-servlet-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-servlet-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,105 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api-jdk14</artifactId>
- <version>2.5-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Java Servlet 2.5 API</name>
- <url>http://www.jboss.org</url>
- <description>The Java Servlet 2.5 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <doctitle>Java Servlet ${project.version} API Documentation</doctitle>
- <links>
- <link>http://java.sun.com/j2se/1.5/docs/api</link>
- </links>
- <windowtitle>Java Servlet ${project.version} API Documentation</windowtitle>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-servlet-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-servlet-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-servlet-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>jboss-servlet-api_3.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Java Servlet 3.0 API</name>
+ <name>Java Servlet 3.0 API</name>
<url>http://www.jboss.org</url>
<description>The Java Servlet 3.0 API classes</description>
<reporting>
Deleted: projects/javaee/trunk/jboss-transaction-api/pom-jdk14.xml
===================================================================
--- projects/javaee/trunk/jboss-transaction-api/pom-jdk14.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-transaction-api/pom-jdk14.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -1,88 +0,0 @@
-<?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.javaee</groupId>
- <artifactId>jboss-javaee-jdk14</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-transaction-api-jdk14</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Transaction 1.0.1 API</name>
- <url>http://www.jboss.org</url>
- <description>The Java Transaction 1.0.1 API classes</description>
- <build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
- </build>
-
- <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>
- <outputDirectory>target/classes-jdk14</outputDirectory>
- <testOutputDirectory>target/test-classes-jdk14</testOutputDirectory>
- </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>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
-
-</project>
Modified: projects/javaee/trunk/jboss-transaction-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-transaction-api/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/jboss-transaction-api/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,15 +2,15 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <artifactId>jboss-transaction-api_1.0</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Transaction 1.0.1 API</name>
+ <name>Transaction 1.0.1 API</name>
<url>http://www.jboss.org</url>
<description>The Java Transaction 1.0.1 API classes</description>
</project>
\ No newline at end of file
Modified: projects/javaee/trunk/pom.xml
===================================================================
--- projects/javaee/trunk/pom.xml 2009-11-11 03:34:04 UTC (rev 96243)
+++ projects/javaee/trunk/pom.xml 2009-11-11 04:29:31 UTC (rev 96244)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee-parent</artifactId>
- <version>6.a1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>6.0.0.Beta1-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss JavaEE 6.0 Aggregate</name>
<url>http://www.jboss.com</url>
More information about the jboss-cvs-commits
mailing list