[jboss-cvs] JBossAS SVN: r72631 - in projects/jboss-aspects/trunk: build and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 23 12:21:23 EDT 2008
Author: dimitris at jboss.org
Date: 2008-04-23 12:21:23 -0400 (Wed, 23 Apr 2008)
New Revision: 72631
Modified:
projects/jboss-aspects/trunk/build/pom.xml
projects/jboss-aspects/trunk/common/pom.xml
projects/jboss-aspects/trunk/current-invocation/pom.xml
projects/jboss-aspects/trunk/pom.xml
projects/jboss-aspects/trunk/remoting/pom.xml
projects/jboss-aspects/trunk/security/pom.xml
projects/jboss-aspects/trunk/transaction/pom.xml
Log:
JBASPECT-4, tidy up the poms and allign all the version numbers to 1.0.0-SNAPSHOT
Modified: projects/jboss-aspects/trunk/build/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/build/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/build/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>4-beta-2</version>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.aspects</groupId>
@@ -36,11 +36,13 @@
<version.jboss.aop>2.0.0.CR8</version.jboss.aop>
<version.jboss.security.spi>2.0.2.Beta5</version.jboss.security.spi>
<version.jboss.transaction.spi>5.0.0.Beta4</version.jboss.transaction.spi>
+ <version.jboss.transaction.api>1.0.1.CR1</version.jboss.transaction.api>
<version.jbosssx.client>2.0.2.Beta5</version.jbosssx.client>
- <version.jboss.kernel>2.0.0.Beta11</version.jboss.kernel>
+ <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
+ <version.org.jboss.man>2.0.0.Beta12</version.org.jboss.man>
<version.jboss.remoting>2.4.0.CR1</version.jboss.remoting>
- <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
- <version.jboss.jaspi.api>1.0-BETA1</version.jboss.jaspi.api>
+ <version.org.jboss.test>1.1.0.GA</version.org.jboss.test>
+ <version.jboss.jaspi.api>1.0.0.CR1</version.jboss.jaspi.api>
<version.jacc>1.0</version.jacc>
<version.junit>4.4</version.junit>
</properties>
@@ -211,10 +213,16 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.kernel}</version>
+ <version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.org.jboss.man}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.security</groupId>
<artifactId>jacc</artifactId>
<version>${version.jacc}</version>
@@ -244,9 +252,15 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ <version>${version.jboss.transaction.api}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<version>${version.org.jboss.test}</version>
<scope>test</scope>
Modified: projects/jboss-aspects/trunk/common/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/common/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/common/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -18,7 +18,7 @@
<!-- Artifact Information -->
<artifactId>jboss-aspects-common</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Aspects Common Libraries</name>
<url>http://www.jboss.org/jbossas</url>
Modified: projects/jboss-aspects/trunk/current-invocation/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/current-invocation/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/current-invocation/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -18,7 +18,7 @@
<!-- Artifact Information -->
<artifactId>jboss-current-invocation-aspects</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Current Invocation Aspects</name>
<url>http://www.jboss.org/jbossas</url>
@@ -32,7 +32,7 @@
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
-
+ <!-- alrubinger specific
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -48,7 +48,7 @@
<argLine>-javaagent:/home/alrubinger/.m2/repository/jboss/aop/jboss-aop-jdk50/2.0.0.CR8/jboss-aop-jdk50-2.0.0.CR8.jar</argLine>
</configuration>
</plugin>
-
+ -->
</plugins>
</build>
@@ -59,36 +59,42 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
+
<dependency>
<groupId>jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
+
<dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-aspects-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta12</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
- <version>2.0.0.Beta10</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: projects/jboss-aspects/trunk/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -1,46 +1,47 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4-beta-2</version>
- </parent>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-aspects-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Aspects Aggregator</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>
- The JBoss Aspects used by EJB3 broken by out of JBoss AS.
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/trunk/</url>
- </scm>
-
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-aspects-aggregator</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Aspects Aggregator</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>
+ The JBoss Aspects used by EJB3 broken by out of JBoss AS.
+ </description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/trunk/</url>
+ </scm>
+
<modules>
- <module>common</module>
- <module>build</module>
- <module>remoting</module>
- <module>security</module>
- <module>transaction</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <generateReleasePoms>true</generateReleasePoms>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <module>build</module>
+ <module>common</module>
+ <module>current-invocation</module>
+ <module>security</module>
+ <module>transaction</module>
+ <module>remoting</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <generateReleasePoms>true</generateReleasePoms>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: projects/jboss-aspects/trunk/remoting/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/remoting/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/remoting/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-remoting-aspects</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Remoting Aspects</name>
<url>http://www.jboss.org/jbossas</url>
@@ -17,38 +17,29 @@
<dependencies>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
</dependency>
+
<dependency>
<groupId>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.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
- <!-- JBAS-5409
-
+ <!-- JBASPECT-3
Dependencies below this line should be removed
-
-->
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-transaction-aspects</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-security-aspects</artifactId>
Modified: projects/jboss-aspects/trunk/security/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/security/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/security/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -44,6 +44,11 @@
<!-- Global dependencies -->
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
@@ -51,6 +56,12 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -68,11 +79,6 @@
<artifactId>jacc</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </dependency>
-
<!-- Test dependencies -->
</dependencies>
</project>
\ No newline at end of file
Modified: projects/jboss-aspects/trunk/transaction/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/transaction/pom.xml 2008-04-23 15:37:51 UTC (rev 72630)
+++ projects/jboss-aspects/trunk/transaction/pom.xml 2008-04-23 16:21:23 UTC (rev 72631)
@@ -57,13 +57,12 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</dependency>
-<!--
- Currently using this weird 1.0.1.20070913080910 version
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</dependency>
--->
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
More information about the jboss-cvs-commits
mailing list