[jboss-cvs] JBossAS SVN: r73349 - in trunk: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 13 10:02:31 EDT 2008
Author: dimitris at jboss.org
Date: 2008-05-13 10:02:31 -0400 (Tue, 13 May 2008)
New Revision: 73349
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/thirdparty/pom.xml
Log:
JBAS-5519, Include slf4j-api 1.5.0 and slf4j-jboss-logging 1.0.0.GA to the build, so components compiled against the slf4j-api can run in AS5.
Also, move from hibernate 3.2.4.SP1 to 3.2.6.GA.
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-05-13 13:58:40 UTC (rev 73348)
+++ trunk/build/build-distr.xml 2008-05-13 14:02:31 UTC (rev 73349)
@@ -1640,7 +1640,8 @@
<copy todir="${install.all.lib}" filtering="no">
<fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
</copy>
- <!-- Copy the generated client libraries -->
+
+ <!-- Copy client libraries -->
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset dir="${antlr.antlr.lib}" includes="antlr.jar"/>
@@ -1731,6 +1732,12 @@
<include name="jboss-sunxacml.jar"/>
<include name="jboss-xacml.jar"/>
</fileset>
+ <fileset dir="${org.slf4j.lib}">
+ <include name="slf4j-api.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.slf4j.lib}">
+ <include name="slf4j-jboss-logging.jar"/>
+ </fileset>
</copy>
<!-- Copy the generated libraries -->
@@ -1842,6 +1849,12 @@
<fileset dir="${jboss.common.logging.jdk.lib}">
<exclude name="*-sources.jar"/>
</fileset>
+ <fileset dir="${org.slf4j.lib}">
+ <include name="slf4j-api.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.slf4j.lib}">
+ <include name="slf4j-jboss-logging.jar"/>
+ </fileset>
<fileset dir="${jboss.integration.lib}">
<include name="jboss-integration.jar"/>
</fileset>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-05-13 13:58:40 UTC (rev 73348)
+++ trunk/build/build.xml 2008-05-13 14:02:31 UTC (rev 73349)
@@ -781,7 +781,6 @@
<uptodate property="bypass-jboss-all-client.on" targetfile="${install.client}/jbossall-client.jar">
<srcfiles dir="${install.client}">
<include name="*-client.jar"/>
- <include name="jboss-logging-*.jar" />
<include name="asm.jar"/>
<include name="cglib-2.1.1.jar"/>
<include name="commons-logging.jar"/>
@@ -794,6 +793,8 @@
<include name="jboss-common*.jar"/>
<include name="jboss-ejb3-ext-api.jar"/>
<include name="jboss-logging*.jar"/>
+ <include name="slf4j-api.jar"/>
+ <include name="slf4j-jboss-logging.jar"/>
<include name="jboss-deployment.jar"/>
<include name="jboss-javaee.jar"/>
<include name="jboss-integration.jar"/>
@@ -840,6 +841,8 @@
<include name="jboss-common*.jar"/>
<include name="jboss-ejb3-ext-api.jar"/>
<include name="jboss-logging*.jar"/>
+ <include name="slf4j-api.jar"/>
+ <include name="slf4j-jboss-logging.jar"/>
<include name="jboss-deployment.jar"/>
<include name="jboss-javaee.jar"/>
<include name="jboss-integration.jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-05-13 13:58:40 UTC (rev 73348)
+++ trunk/component-matrix/pom.xml 2008-05-13 14:02:31 UTC (rev 73349)
@@ -916,21 +916,59 @@
</dependency>
<dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <version>3.2.4.SP1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.0</version>
</dependency>
<dependency>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.6.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- re-enable when switching to hibernate 3.3.0.CR1
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-jmx</artifactId>
<version>3.3.0.CR1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+ -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.3.2.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -943,6 +981,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.3.1.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -955,6 +999,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>3.0.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1215,6 +1265,10 @@
<version>0.1.0</version>
<exclusions>
<exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss</groupId>
<artifactId>jboss-metadata</artifactId>
</exclusion>
@@ -1260,6 +1314,10 @@
<classifier>client</classifier>
<exclusions>
<exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss</groupId>
<artifactId>jboss-metadata</artifactId>
</exclusion>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-05-13 13:58:40 UTC (rev 73348)
+++ trunk/thirdparty/pom.xml 2008-05-13 14:02:31 UTC (rev 73349)
@@ -728,6 +728,22 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <mapping>
+ <componentId>hibernate</componentId>
+ </mapping>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
+ <mapping>
+ <componentId>hibernate</componentId>
+ </mapping>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<mapping>
<componentId>hibernate-annotations</componentId>
@@ -1113,15 +1129,29 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
+ <artifactId>hibernate</artifactId>
</dependency>
+ <!--
<dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jmx</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list