[jboss-cvs] JBossAS SVN: r68014 - in trunk: build and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 6 18:55:15 EST 2007
Author: pgier
Date: 2007-12-06 18:55:15 -0500 (Thu, 06 Dec 2007)
New Revision: 68014
Modified:
trunk/aspects/pom.xml
trunk/build/pom.xml
trunk/connector/pom.xml
trunk/console/pom.xml
trunk/deployment/pom.xml
trunk/ejb3/pom.xml
trunk/iiop/pom.xml
trunk/j2se/pom.xml
trunk/jbossas/remoting/pom.xml
trunk/jbossmq/pom.xml
trunk/mbeans/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
Log:
[JBBUILD-294] Updates to the security and hibernate dependencies and some other minor changes
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/aspects/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -26,7 +26,7 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
@@ -94,7 +94,7 @@
<artifactId>javassist</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/build/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -18,7 +18,8 @@
<version.junit>3.8.1</version.junit>
<version.org.jboss.aop>2.0.0-SNAPSHOT</version.org.jboss.aop>
<version.org.jboss.common-core>2.2.1.GA</version.org.jboss.common-core>
- <version.org.jboss.microcontainer>2.0.0.Beta6</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.0-SNAPSHOT</version.org.jboss.microcontainer>
+ <version.org.jboss.security>2.0.2.beta1-SNAPSHOT</version.org.jboss.security>
<version.oswego-concurrent.concurrent>1.3.4-jboss</version.oswego-concurrent.concurrent>
</properties>
@@ -141,12 +142,22 @@
<artifactId>hibernate-annotations</artifactId>
<version>3.2.1.GA</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>hibernate-entitymanager</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.2.1.GA</version>
+ <version>3.3.2.Beta1</version>
+ </dependency>-->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.2.Beta1</version>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>3.3.2.Beta1</version>
+ </dependency>
+ <dependency>
<groupId>jacorb</groupId>
<artifactId>jacorb</artifactId>
<version>2.3.0jboss.patch4-brew</version>
@@ -240,8 +251,8 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- <version>2.0.1-GA</version>
+ <artifactId>jboss-security-spi-bare</artifactId>
+ <version>${version.org.jboss.security}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -260,9 +271,9 @@
<version>2.5-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2.alpha1</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -471,6 +482,16 @@
<version>1.0.0.BETA1</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>0.1.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-impl</artifactId>
+ <version>0.1.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/connector/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -21,12 +21,24 @@
<directory>src/resources</directory>
</resource>
</resources>
+ <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>
+
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -126,7 +138,7 @@
<artifactId>jaas</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/console/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -98,7 +98,7 @@
<artifactId>jboss-as-server</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/deployment/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -43,10 +43,10 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/ejb3/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -26,21 +26,33 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>hibernate-annotations</groupId>
<artifactId>hibernate-annotations</artifactId>
</dependency>
<dependency>
- <groupId>hibernate-entitymanager</groupId>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </dependency>
+ <dependency>
<groupId>hibernate</groupId>
<artifactId>hibernate3</artifactId>
</dependency>
@@ -159,7 +171,7 @@
<artifactId>jboss-jca-api</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/iiop/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -69,7 +69,7 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>apache-avalon</groupId>
@@ -149,7 +149,7 @@
<artifactId>jta</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/j2se/pom.xml
===================================================================
--- trunk/j2se/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/j2se/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -26,6 +26,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
Modified: trunk/jbossas/remoting/pom.xml
===================================================================
--- trunk/jbossas/remoting/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/jbossas/remoting/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
</dependencies>
Modified: trunk/jbossmq/pom.xml
===================================================================
--- trunk/jbossmq/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/jbossmq/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -46,7 +46,7 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -98,7 +98,7 @@
<artifactId>jaas</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/mbeans/pom.xml
===================================================================
--- trunk/mbeans/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/mbeans/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -16,11 +16,23 @@
<description>JBoss Application Server (mbeans module)</description>
<build>
<sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
<resources>
<resource>
<directory>src/resources</directory>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+
+ </configuration>
+ </plugin>
+
+ </plugins>
</build>
<dependencies>
<!-- Compile (global dependencies) -->
@@ -52,6 +64,16 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.5-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/security/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -26,7 +26,7 @@
<!-- Compile (global dependencies) -->
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -61,7 +61,7 @@
<artifactId>jboss-jaspi-api</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/server/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -155,7 +155,7 @@
<artifactId>jboss-jca-api</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/tomcat/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
+ <artifactId>jboss-security-spi-bare</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -77,7 +77,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2007-12-06 23:31:34 UTC (rev 68013)
+++ trunk/varia/pom.xml 2007-12-06 23:55:15 UTC (rev 68014)
@@ -158,7 +158,7 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list