[jboss-cvs] JBossAS SVN: r99847 - in projects/javaee/trunk: jboss-annotations-api and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 22 17:36:23 EST 2010
Author: jdcasey
Date: 2010-01-22 17:36:21 -0500 (Fri, 22 Jan 2010)
New Revision: 99847
Added:
projects/javaee/trunk/jboss-javaee/
projects/javaee/trunk/jboss-spec-parent/
projects/javaee/trunk/jboss-spec-parent/pom.xml
Removed:
projects/javaee/trunk/build/
projects/javaee/trunk/jboss-javaee/.project
Modified:
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-interceptors-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-javaee/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:
Aligning specification builds under new standard, and creating collection POM (not aggregation jar) to allow shorthand references to J2EE APIs. This collection POM probably needs more references for J2EE specification projects that are still outside this project structure.
Modified: projects/javaee/trunk/jboss-annotations-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-annotations-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-annotations-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-annotations-api_1.1</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Common Annotations 1.1 API</name>
@@ -28,4 +28,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-ejb-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-ejb-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-ejb-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -3,14 +3,14 @@
-->
<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-parent</artifactId>
- <version>6.0.0-alpha-1</version>
- <relativePath>../build/pom.xml</relativePath>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>EJB 3.1 API</name>
@@ -31,9 +31,8 @@
<dependencies>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api_1.0</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.0_spec</artifactId>
</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 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-el-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-el-api_1.2</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_1.2_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Expression Language 1.2 API</name>
@@ -28,4 +28,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-interceptors-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-interceptors-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-interceptors-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-interceptors-api_1.1</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Interceptors 1.1 API</name>
Modified: projects/javaee/trunk/jboss-jacc-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jacc-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jacc-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api_1.1</artifactId>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JACC 1.1 API</name>
@@ -19,9 +19,8 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api_3.0</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
</dependencies>
</project>
Modified: projects/javaee/trunk/jboss-jad-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jad-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jad-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api_1.2</artifactId>
+ <groupId>org.jboss.spec.javax.enterprise</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JavaEE Application Deployment 1.2 API</name>
@@ -25,4 +25,4 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-jaspi-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jaspi-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jaspi-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,16 +1,16 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api_1.0</artifactId>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<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 API classes</description>
-</project>
\ No newline at end of file
+</project>
Copied: projects/javaee/trunk/jboss-javaee (from rev 99817, projects/javaee/trunk/build)
Deleted: projects/javaee/trunk/jboss-javaee/.project
===================================================================
--- projects/javaee/trunk/build/.project 2010-01-22 16:33:34 UTC (rev 99817)
+++ projects/javaee/trunk/jboss-javaee/.project 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
Modified: projects/javaee/trunk/jboss-javaee/pom.xml
===================================================================
--- projects/javaee/trunk/build/pom.xml 2010-01-22 16:33:34 UTC (rev 99817)
+++ projects/javaee/trunk/jboss-javaee/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,131 +1,79 @@
<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>5-beta-5</version>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee-parent</artifactId>
+ <artifactId>jboss-javaee</artifactId>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss JavaEE 6.0 Parent</name>
+ <name>JBoss JavaEE 6.0</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://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/5-beta-5/jboss-javaee-parent</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/javaee/trunk/jboss-javaee</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/javaee/trunk/jboss-javaee</developerConnection>
+ <url>http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/5-beta-5/jboss-javaee</url>
</scm>
-
- <properties>
- <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- </properties>
-
- <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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>false</printSummary>
- <testFailureIgnore>true</testFailureIgnore>
- <includes>
- <include>**/**TestCase.java</include>
- </includes>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/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>
- <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>
-
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.6_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_1.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.enterprise</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.0_spec</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: projects/javaee/trunk/jboss-jaxr-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jaxr-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jaxr-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaxr-api_1.0</artifactId>
+ <groupId>org.jboss.spec.javax.xml</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Java API for XML Registries 1.0</name>
@@ -20,4 +20,4 @@
<version>1.0.2</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-jca-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jca-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jca-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api_1.6</artifactId>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.6_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss J2EE Connector Architecture 1.6 API</name>
@@ -20,9 +20,8 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api_1.0</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.0_spec</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-jms-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jms-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jms-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,16 +1,16 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api_1.1</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<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
+</project>
Modified: projects/javaee/trunk/jboss-jsp-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-jsp-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-jsp-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jsp-api_2.2</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Java Server Pages 2.2 API</name>
@@ -30,14 +30,12 @@
</reporting>
<dependencies>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-el-api_1.2</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_1.2_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api_3.0</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/javaee/trunk/jboss-servlet-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-servlet-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-servlet-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,13 +1,13 @@
<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-parent</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api_3.0</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Java Servlet 3.0 API</name>
@@ -28,4 +28,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Added: projects/javaee/trunk/jboss-spec-parent/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-spec-parent/pom.xml (rev 0)
+++ projects/javaee/trunk/jboss-spec-parent/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -0,0 +1,198 @@
+<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>5-beta-5</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Specification APIs Parent</name>
+ <url>http://www.jboss.com</url>
+ <description>
+ The Parent POM for JBoss Specification APIs
+ </description>
+
+ <properties>
+ <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ </properties>
+
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.6_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_1.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.enterprise</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <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://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/5-beta-5/jboss-spec-parent</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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>false</printSummary>
+ <testFailureIgnore>true</testFailureIgnore>
+ <includes>
+ <include>**/**TestCase.java</include>
+ </includes>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/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>
+
+ <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/jboss-transaction-api/pom.xml
===================================================================
--- projects/javaee/trunk/jboss-transaction-api/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/jboss-transaction-api/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,16 +1,16 @@
<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-parent</artifactId>
- <version>6.0.0-alpha-1</version>
- <relativePath>../build/pom.xml</relativePath>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <relativePath>../jboss-spec-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api_1.0</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.0_spec</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<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
+</project>
Modified: projects/javaee/trunk/pom.xml
===================================================================
--- projects/javaee/trunk/pom.xml 2010-01-22 22:28:52 UTC (rev 99846)
+++ projects/javaee/trunk/pom.xml 2010-01-22 22:36:21 UTC (rev 99847)
@@ -1,19 +1,19 @@
<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-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <relativePath>build/pom.xml</relativePath>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5-beta-5</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-spec-aggregator</artifactId>
<version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss JavaEE 6.0 Aggregate</name>
+ <name>JBoss Specification API Aggregator POM</name>
<url>http://www.jboss.com</url>
<description>
- The JBoss JavaEE API classes
+ Aggregator POM that allows building all specification projects at once.
</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/javaee/trunk</connection>
@@ -21,7 +21,13 @@
</scm>
<modules>
- <module>build</module>
+ <!-- parent POM -->
+ <module>jboss-spec-parent</module>
+
+ <!-- collections -->
+ <module>jboss-javaee</module>
+
+ <!-- individual specs -->
<module>jboss-annotations-api</module>
<module>jboss-ejb-api</module>
<module>jboss-el-api</module>
@@ -36,62 +42,5 @@
<module>jboss-transaction-api</module>
<module>jboss-jaspi-api</module>
</modules>
-
- <profiles>
- <profile>
- <id>assembly</id>
- <activation>
- <property>
- <name>!skip.assembly</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <goals>
- <goal>attached</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>build/assembly/bin.xml</descriptor>
- <descriptor>build/assembly/sources.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/javaee/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- <groupId>jboss</groupId>
- </configuration>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
More information about the jboss-cvs-commits
mailing list