[jboss-cvs] JBossAS SVN: r103711 - in projects/embedded/trunk: core and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 8 12:46:44 EDT 2010
Author: ALRubinger
Date: 2010-04-08 12:46:43 -0400 (Thu, 08 Apr 2010)
New Revision: 103711
Modified:
projects/embedded/trunk/build/pom.xml
projects/embedded/trunk/core/pom.xml
projects/embedded/trunk/testsuite/pom.xml
Log:
[EMB-85] Remove cyclic dependency from all modules except the testsuite, which is to move to AS. Not working due to exclusions not honored from as-depchain
Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml 2010-04-08 16:46:07 UTC (rev 103710)
+++ projects/embedded/trunk/build/pom.xml 2010-04-08 16:46:43 UTC (rev 103711)
@@ -7,9 +7,9 @@
<!-- Parent -->
<parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version> <!-- Must match version.org.jboss.jbossas below -->
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
</parent>
<!-- Model Version -->
@@ -28,8 +28,8 @@
<!-- Versioning -->
<version.junit_junit>4.7</version.junit_junit>
- <version.org.jboss.jbossas>6.0.0-SNAPSHOT</version.org.jboss.jbossas>
<version.org.jboss.shrinkwrap>1.0.0-alpha-7</version.org.jboss.shrinkwrap>
+ <version.org.jboss.bootstrap>2.1.0-alpha-4</version.org.jboss.bootstrap>
</properties>
@@ -156,235 +156,52 @@
<version>${version.org.jboss.shrinkwrap}</version>
</dependency>
- <!--
-
- AS Module Dependencies (should eventually come in through a
- single AS dependency declaration)
- -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-distribution</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <type>pom</type>
- </dependency>
+ <!-- org.jboss.bootstrap -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <classifier>jboss-aspect-library</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-cluster</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <classifier>jboss-common-jdbc-wrapper</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <classifier>jboss-jca</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <classifier>jboss-jca-deployer</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- <classifier>jboss-local-jdbc</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-console</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-deployment</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-deployment</artifactId>
- <classifier>jboss-jsr88</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <classifier>client</classifier>
- <version>${version.org.jboss.jbossas}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-hibernate-int</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-hornetq-int</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jbossas-remoting</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <classifier>ejb-management</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <classifier>jsr77</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-management</artifactId>
- <classifier>jsr77-client</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <classifier>jboss</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <classifier>jmx-adaptor-plugin</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <classifier>jboss-web-service</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <classifier>jboss-web-deployer</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-varia</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-varia</artifactId>
- <classifier>jboss-srp</classifier>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- </dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-as</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-api-mc</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-base</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-as</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-mc</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-spi</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-spi-as</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-spi-mc</artifactId>
+ <version>${version.org.jboss.bootstrap}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: projects/embedded/trunk/core/pom.xml
===================================================================
--- projects/embedded/trunk/core/pom.xml 2010-04-08 16:46:07 UTC (rev 103710)
+++ projects/embedded/trunk/core/pom.xml 2010-04-08 16:46:43 UTC (rev 103711)
@@ -25,6 +25,10 @@
<properties>
<version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
+ <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
+ <version.org.jboss_jboss.common.core>2.2.17.GA</version.org.jboss_jboss.common.core>
+ <version.org.jboss.logging_jboss.logging>3.0.0.Beta2</version.org.jboss.logging_jboss.logging>
+ <version.org.jboss.logmanager_jboss.logmanager>1.2.0.CR2</version.org.jboss.logmanager_jboss.logmanager>
</properties>
@@ -50,12 +54,15 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
<scope>provided</scope>
+ <version>${version.org.jboss.deployers}</version>
</dependency>
<!-- org.jboss:jboss-common-core -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
+ <version>${version.org.jboss_jboss.common.core}</version>
+ <scope>provided</scope>
</dependency>
<!-- org.jboss.shrinkwrap -->
@@ -68,23 +75,19 @@
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
+ <version>${version.org.jboss.logmanager_jboss.logmanager}</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
+ <version>${version.org.jboss.logging_jboss.logging}</version>
</dependency>
<!--
- Test Dependencies (anything in AS is OK here)
+ Test Dependencies
-->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-distribution</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${version.org.jboss.reflect}</version>
Modified: projects/embedded/trunk/testsuite/pom.xml
===================================================================
--- projects/embedded/trunk/testsuite/pom.xml 2010-04-08 16:46:07 UTC (rev 103710)
+++ projects/embedded/trunk/testsuite/pom.xml 2010-04-08 16:46:43 UTC (rev 103711)
@@ -22,6 +22,7 @@
<properties>
<!-- JBOSS_HOME (We'll unpack into here -->
+ <version.org.jboss.jbossas>6.0.0-SNAPSHOT</version.org.jboss.jbossas>
<JBOSS_HOME>${project.build.directory}/jboss-${version.org.jboss.jbossas}</JBOSS_HOME>
<!-- Versioning -->
@@ -114,14 +115,22 @@
<!-- Dependencies -->
<dependencies>
+ <!-- All AS runtime dependencies -->
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-depchain</artifactId>
- <version>${version}</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
<scope>test</scope>
<type>pom</type>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-component-matrix</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
<!-- JUnit -->
<dependency>
<groupId>junit</groupId>
@@ -140,38 +149,21 @@
<version>${version.org.apache.httpcomponents_httpclient}</version>
<scope>test</scope>
</dependency>
-
+
+ <!-- These should come in throgh the depchain once added -->
<dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
<scope>test</scope>
- <optional>true</optional>
</dependency>
-
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>${version.org.hibernate.javax.persistence}</version>
+ <groupId>org.jboss.embedded</groupId>
+ <artifactId>jboss-embedded-core</artifactId>
+ <version>${version}</version>
<scope>test</scope>
- <optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <version>${version.spec.javaee.servlet.api}</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>${version.spec.javaee.ejb.api}</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
More information about the jboss-cvs-commits
mailing list