[jboss-cvs] JBossAS SVN: r114526 - in branches/JBPAPP_5: adminclient and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 8 11:52:13 EDT 2013
Author: ehugonnet
Date: 2013-10-08 11:52:13 -0400 (Tue, 08 Oct 2013)
New Revision: 114526
Modified:
branches/JBPAPP_5/adminclient/
branches/JBPAPP_5/aspects/pom.xml
branches/JBPAPP_5/client/pom.xml
branches/JBPAPP_5/component-matrix/pom.xml
branches/JBPAPP_5/connector/pom.xml
branches/JBPAPP_5/deployment/pom.xml
branches/JBPAPP_5/ejb3/pom.xml
branches/JBPAPP_5/iiop/pom.xml
branches/JBPAPP_5/main/pom.xml
branches/JBPAPP_5/messaging/pom.xml
branches/JBPAPP_5/pom.xml
branches/JBPAPP_5/security/pom.xml
branches/JBPAPP_5/server/pom.xml
branches/JBPAPP_5/spring-int/pom.xml
branches/JBPAPP_5/tomcat/pom.xml
branches/JBPAPP_5/varia/pom.xml
branches/JBPAPP_5/webservices/pom.xml
Log:
JBPAPP-10712 : cleaning the POMs to be coherent on artifact ids for spec APIs.
Removing duplicate declarations.
Property changes on: branches/JBPAPP_5/adminclient
___________________________________________________________________
Modified: svn:ignore
- *.iml
+ *.iml
target
Modified: branches/JBPAPP_5/aspects/pom.xml
===================================================================
--- branches/JBPAPP_5/aspects/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/aspects/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -65,6 +65,12 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-as-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.system</groupId>
+ <artifactId>system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
Modified: branches/JBPAPP_5/client/pom.xml
===================================================================
--- branches/JBPAPP_5/client/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/client/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -257,7 +257,7 @@
</dependency>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
Modified: branches/JBPAPP_5/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5/component-matrix/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/component-matrix/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1016,19 +1016,6 @@
<version>${version.hornetq}</version>
</dependency>
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-ra</artifactId>
- <version>${version.hornetq}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-resources</artifactId>
- <version>${version.hornetq}</version>
- </dependency>
-
-
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
@@ -1117,21 +1104,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
-
- <dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>0.9.3</version>
@@ -1492,6 +1468,10 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1878,6 +1858,10 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-jmx-mc-int</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.system</groupId>
+ <artifactId>system-jmx</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2378,27 +2362,27 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
- </repository>
- <repository>
- <id>nexus.jboss.org</id>
+ </repository>
+ <repository>
+ <id>central-repository.jboss.org</id>
<name>JBoss Nexus Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
+ <enabled>false</enabled>
</snapshots>
</repository>
<repository>
- <id>central-repository.jboss.org</id>
+ <id>nexus.jboss.org</id>
<name>JBoss Nexus Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
</repositories>
Modified: branches/JBPAPP_5/connector/pom.xml
===================================================================
--- branches/JBPAPP_5/connector/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/connector/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1,194 +1,227 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Application Server Connector</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (connector module)</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/jboss/resource/adapter/jdbc/jdk6/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <!-- Compile (global dependencies) -->
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- </dependency>
- <dependency>
- <groupId>quartz</groupId>
- <artifactId>quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.common</groupId>
- <artifactId>jboss-common-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-integration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>jdk6</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
+ <artifactId>jboss-as-connector</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server Connector</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (connector module)</description>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <excludes>
- <exclude>org/jboss/resource/adapter/jdbc/jdk5/**</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk6/**</exclude>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk7/**</exclude>
+ <exclude>org/jboss/resource/adapter/jdbc/jdbc4_1/**</exclude>
+ </excludes>
+ <compilerVersion>1.5</compilerVersion>
+ <showDeprecation>false</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
- </profiles>
+ </build>
+ <dependencies>
+ <!-- Compile (global dependencies) -->
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.common</groupId>
+ <artifactId>jboss-common-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-integration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-integration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>jdk6</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <excludes>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk5/**</exclude>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk7/**</exclude>
+ <exclude>org/jboss/resource/adapter/jdbc/jdbc4_1/**</exclude>
+ </excludes>
+ <compilerVersion>1.6</compilerVersion>
+ <!-- <compilerArgs>
+ <arg>-bootclasspath ${java6.home}/jre/lib/rt.jar</arg>
+ </compilerArgs>-->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdk7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <excludes>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk5/**</exclude>
+ <exclude>org/jboss/resource/adapter/jdbc/jdk6/**</exclude>
+ </excludes>
+ <compilerVersion>1.7</compilerVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: branches/JBPAPP_5/deployment/pom.xml
===================================================================
--- branches/JBPAPP_5/deployment/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/deployment/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api</artifactId>
+ <artifactId>jboss-jad-api-1.2_spec</artifactId>
</dependency>
<dependency>
@@ -127,22 +127,23 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
+ <version>5.0.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <artifactId>jboss-jacc-api-1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <artifactId>jboss-jca-api-1.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <artifactId>jboss-jms-api-1.1_spec</artifactId>
</dependency>
<dependency>
Modified: branches/JBPAPP_5/ejb3/pom.xml
===================================================================
--- branches/JBPAPP_5/ejb3/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/ejb3/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1,209 +1,215 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Application Server EJB3</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (ejb3 module)</description>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server EJB3</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (ejb3 module)</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jacorb</groupId>
- <artifactId>jacorb</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-client</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-as-int</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-as-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.system</groupId>
+ <artifactId>system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ejb3.vfs</groupId>
- <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.vfs</groupId>
+ <artifactId>jboss-ejb3-vfs-impl-vfs2</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <classifier>client</classifier>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <classifier>client</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-endpoint-deployer</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api-1.1_spec</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-corba-ots-spi</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-corba-ots-spi</artifactId>
- </dependency>
-
- </dependencies>
+ </dependencies>
</project>
Modified: branches/JBPAPP_5/iiop/pom.xml
===================================================================
--- branches/JBPAPP_5/iiop/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/iiop/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
</dependency>
<dependency>
Modified: branches/JBPAPP_5/main/pom.xml
===================================================================
--- branches/JBPAPP_5/main/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/main/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1,81 +1,80 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Application Server Main</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (main module)</description>
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <verbose>true</verbose>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assembly</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
- </configuration>
- </execution>
- <execution>
- <id>assemble-run-jar</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/run.xml</descriptor>
- </descriptors>
- <archive>
- <manifestEntries>
- <Main-Class>org.jboss.Main</Main-Class>
- <Class-Path>../client/getopt.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <!-- Compile (global dependencies) -->
- <dependency>
- <groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap</artifactId>
- </dependency>
- <dependency>
- <groupId>gnu-getopt</groupId>
- <artifactId>getopt</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logbridge</groupId>
- <artifactId>jboss-logbridge</artifactId>
- </dependency>
- </dependencies>
-
+ <artifactId>jboss-as-main</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server Main</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (main module)</description>
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>assemble-run-jar</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/run.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Main-Class>org.jboss.Main</Main-Class>
+ <Class-Path>../client/getopt.jar</Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <!-- Compile (global dependencies) -->
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logbridge</groupId>
+ <artifactId>jboss-logbridge</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: branches/JBPAPP_5/messaging/pom.xml
===================================================================
--- branches/JBPAPP_5/messaging/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/messaging/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <artifactId>jboss-jms-api-1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: branches/JBPAPP_5/pom.xml
===================================================================
--- branches/JBPAPP_5/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1,406 +1,409 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>5.3.0-SNAPSHOT</version>
+ <relativePath>component-matrix</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- <relativePath>component-matrix</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Application Server Parent POM</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (aggregator)</description>
+ <artifactId>jboss-as-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Application Server Parent POM</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (aggregator)</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/branches/JBPAPP_5</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/branches/JBPAPP_5</developerConnection>
- <url>http://fisheye.jboss.org/browse/JBossAS</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/branches/JBPAPP_5</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/branches/JBPAPP_5</developerConnection>
+ <url>http://fisheye.jboss.org/browse/JBossAS</url>
+ </scm>
- <build>
+ <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-URL>${pom.url}</Implementation-URL>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>idlj-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rmic-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerVersion>1.5</compilerVersion>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ <verbose>false</verbose>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>
+ true
+ </addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${project.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>
+ true
+ </addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-URL>${project.url}</Implementation-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>idlj-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rmic-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
- <!-- Dependency Management -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-cluster</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-cluster</artifactId>
- <version>${project.version}</version>
- <classifier>jboss-ha-legacy-client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-deployment</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${project.version}</version>
- <classifier>jmx-invoker-adaptor-client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jbossmq</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <version>${project.version}</version>
- <classifier>jsr77-client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-mbeans</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${project.version}</version>
- <classifier>profileservice-spi</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${project.version}</version>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-varia</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <!-- Dependency Management -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-cluster</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-cluster</artifactId>
+ <version>${project.version}</version>
+ <classifier>jboss-ha-legacy-client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${project.version}</version>
+ <classifier>jmx-invoker-adaptor-client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jbossmq</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <version>${project.version}</version>
+ <classifier>jsr77-client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-mbeans</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${project.version}</version>
+ <classifier>profileservice-spi</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${project.version}</version>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <profiles>
+ <profiles>
- <!-- By default build all modules -->
- <profile>
- <id>default-build</id>
- <activation>
- <property>
- <name>!integrated-build</name>
- </property>
- </activation>
- <modules>
- <module>component-matrix</module>
- <module>main</module>
- <module>j2se</module>
- <module>mbeans</module>
- <module>jmx</module>
- <module>system</module>
- <module>system-jmx</module>
- <module>security</module>
- <module>server</module>
- <module>deployment</module>
- <module>jbossas</module>
- <module>jmx-remoting</module>
- <module>messaging</module>
- <module>cluster</module>
- <module>varia</module>
- <module>iiop</module>
- <module>aspects</module>
- <module>profileservice</module>
- <module>connector</module>
- <module>management</module>
- <module>ejb3</module>
- <module>tomcat</module>
- <module>webservices</module>
- <module>hibernate-int</module>
- <module>console</module>
- <module>spring-int</module>
- <!--<module>embedded</module>-->
- <module>client</module>
- <module>build</module>
- <module>adminclient</module>
- </modules>
- </profile>
+ <!-- By default build all modules -->
+ <profile>
+ <id>default-build</id>
+ <activation>
+ <property>
+ <name>!integrated-build</name>
+ </property>
+ </activation>
+ <modules>
+ <module>component-matrix</module>
+ <module>main</module>
+ <module>j2se</module>
+ <module>mbeans</module>
+ <module>jmx</module>
+ <module>system</module>
+ <module>system-jmx</module>
+ <module>security</module>
+ <module>server</module>
+ <module>deployment</module>
+ <module>jbossas</module>
+ <module>jmx-remoting</module>
+ <module>messaging</module>
+ <module>cluster</module>
+ <module>varia</module>
+ <module>iiop</module>
+ <module>aspects</module>
+ <module>profileservice</module>
+ <module>connector</module>
+ <module>management</module>
+ <module>ejb3</module>
+ <module>tomcat</module>
+ <module>webservices</module>
+ <module>hibernate-int</module>
+ <module>console</module>
+ <module>spring-int</module>
+ <!--<module>embedded</module>-->
+ <module>client</module>
+ <module>build</module>
+ <module>adminclient</module>
+ </modules>
+ </profile>
- <!-- This profile is used by the ant/buildmagic build -->
- <profile>
- <id>integrated-build</id>
- <activation>
- <property>
- <name>integrated-build</name>
- </property>
- </activation>
- <modules>
- <module>component-matrix</module>
- <module>thirdparty</module>
- </modules>
- </profile>
+ <!-- This profile is used by the ant/buildmagic build -->
+ <profile>
+ <id>integrated-build</id>
+ <activation>
+ <property>
+ <name>integrated-build</name>
+ </property>
+ </activation>
+ <modules>
+ <module>component-matrix</module>
+ <module>thirdparty</module>
+ </modules>
+ </profile>
- <profile>
- <id>enforce</id>
- <activation>
- <property>
- <name>!skip-enforce</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <id>enforce-java-maven-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0.9</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.5</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-plugin-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requirePluginVersions>
- <message>Best Practice is to always define plugin versions!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- <banSnapshots>true</banSnapshots>
- <phases>clean,deploy,site</phases>
- </requirePluginVersions>
- </rules>
- <fail>false</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>enforce</id>
+ <activation>
+ <property>
+ <name>!skip-enforce</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>enforce-java-maven-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.5</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ <execution>
+ <id>enforce-plugin-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requirePluginVersions>
+ <message>Best Practice is to always define plugin versions!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ <banSnapshots>true</banSnapshots>
+ <phases>clean,deploy,site</phases>
+ </requirePluginVersions>
+ </rules>
+ <fail>false</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- </profiles>
+ </profiles>
</project>
Modified: branches/JBPAPP_5/security/pom.xml
===================================================================
--- branches/JBPAPP_5/security/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/security/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -89,12 +89,12 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <artifactId>jboss-jacc-api-1.1_spec</artifactId>
</dependency>
<dependency>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <artifactId>jboss-jaspi-api-1.0_spec</artifactId>
</dependency>
<dependency>
@@ -128,7 +128,7 @@
</dependency>
<dependency>
- <groupId>org.apache</groupId>
+ <groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
Modified: branches/JBPAPP_5/server/pom.xml
===================================================================
--- branches/JBPAPP_5/server/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/server/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -239,7 +239,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
</dependency>
<dependency>
@@ -265,7 +265,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <artifactId>jboss-jacc-api-1.1_spec</artifactId>
</dependency>
<dependency>
@@ -285,7 +285,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <artifactId>jboss-jms-api-1.1_spec</artifactId>
</dependency>
<dependency>
@@ -297,6 +297,11 @@
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.naming</groupId>
@@ -305,7 +310,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <artifactId>jboss-jca-api-1.5_spec</artifactId>
</dependency>
<dependency>
Modified: branches/JBPAPP_5/spring-int/pom.xml
===================================================================
--- branches/JBPAPP_5/spring-int/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/spring-int/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Modified: branches/JBPAPP_5/tomcat/pom.xml
===================================================================
--- branches/JBPAPP_5/tomcat/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/tomcat/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -147,7 +147,7 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <artifactId>jboss-jaspi-api-1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -164,15 +164,15 @@
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <artifactId>jboss-jacc-api-1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <artifactId>jboss-jca-api-1.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <artifactId>jboss-ejb-api-3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: branches/JBPAPP_5/varia/pom.xml
===================================================================
--- branches/JBPAPP_5/varia/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/varia/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -232,10 +232,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<excludes>
<exclude>org/jboss/varia/stats/*JDK6.java</exclude>
+ <exclude>org/jboss/varia/stats/*JDK7.java</exclude>
+ <exclude>org/jboss/varia/stats/*JDBC4_1.java</exclude>
<exclude>org/jboss/tm/plugins/tyrex/*.java</exclude>
<exclude>org/jboss/jdo/castor/*.java</exclude>
</excludes>
@@ -254,10 +255,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<excludes>
<exclude>org/jboss/varia/stats/*JDK5.java</exclude>
+ <exclude>org/jboss/varia/stats/*JDK7.java</exclude>
+ <exclude>org/jboss/varia/stats/*JDBC4_1.java</exclude>
<exclude>org/jboss/tm/plugins/tyrex/*.java</exclude>
<exclude>org/jboss/jdo/castor/*.java</exclude>
</excludes>
@@ -266,6 +268,28 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jdk7</id>
+ <activation>
+ <jdk>1.7</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/varia/stats/*JDK5.java</exclude>
+ <exclude>org/jboss/varia/stats/*JDK6.java</exclude>
+ <exclude>org/jboss/tm/plugins/tyrex/*.java</exclude>
+ <exclude>org/jboss/jdo/castor/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: branches/JBPAPP_5/webservices/pom.xml
===================================================================
--- branches/JBPAPP_5/webservices/pom.xml 2013-10-08 15:49:21 UTC (rev 114525)
+++ branches/JBPAPP_5/webservices/pom.xml 2013-10-08 15:52:13 UTC (rev 114526)
@@ -1,169 +1,178 @@
<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>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>5.3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Application Server Webservices</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server (webservices module)</description>
+ <artifactId>jboss-as-webservices</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Application Server Webservices</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server (webservices module)</description>
- <!-- Dependencies -->
- <dependencies>
- <!-- jbossws dependencies -->
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </dependency>
- <!-- jboss provided dependencies -->
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <scope>provided</scope>
- <classifier>client</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-as-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-common</artifactId>
- <version>${version.org.jboss.ejb3.common.client}</version>
- </dependency>
- <!-- transitive dependencies -->
- <dependency>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-jms-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </dependency>
- </dependencies>
+ <!-- Dependencies -->
+ <dependencies>
+ <!-- jbossws dependencies -->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <!-- jboss provided dependencies -->
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <scope>provided</scope>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-as-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.system</groupId>
+ <artifactId>system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <scope>provided</scope>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ </dependency>
+ <!-- transitive dependencies -->
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ </dependencies>
- <!-- Plugins -->
- <build>
- <sourceDirectory>src/main</sourceDirectory>
- <resources>
- <resource>
- <directory>src/resources/jbossws-jboss50.jar</directory>
- </resource>
- <resource>
- <directory>src/resources/jbossws-hornetq.jar</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/scripts/assembly-resources.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <!-- Plugins -->
+ <build>
+ <sourceDirectory>src/main</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources/jbossws-jboss50.jar</directory>
+ </resource>
+ <resource>
+ <directory>src/resources/jbossws-hornetq.jar</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/scripts/assembly-resources.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
More information about the jboss-cvs-commits
mailing list