Author: smcgowan(a)redhat.com
Date: 2010-01-19 14:15:48 -0500 (Tue, 19 Jan 2010)
New Revision: 867
Modified:
trunk/core/pom.xml
trunk/pom.xml
Log:
updating artifact versions in preparation for deployment to JBoss AS 6
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-01-18 16:22:50 UTC (rev 866)
+++ trunk/core/pom.xml 2010-01-19 19:15:48 UTC (rev 867)
@@ -105,14 +105,13 @@
<groupId>${seam.groupId}</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${seam.version}</version>
- <!-- EMBJOPR-269
+ <!-- EMBJOPR-269 -->
<exclusions>
<exclusion>
<groupId>${seam.groupId}</groupId>
<artifactId>jboss-seam-jul</artifactId>
</exclusion>
</exclusions>
- -->
</dependency>
<!-- third party dependencies needed when running tests with Seam -->
<dependency>
@@ -132,7 +131,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.5.0.GA</version>
+ <version>3.11.0.GA</version>
<scope>test</scope>
</dependency>
<!--
@@ -143,15 +142,15 @@
IIRC this is fixed in jdk6. -->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
+ <version>2.0-cr-1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
+ <version>3.5.0-Beta-2</version>
<scope>provided</scope>
</dependency>
<!-- don't know why this is required if you dont have it you get:
@@ -159,9 +158,16 @@
facesMessages.add(new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage,
null));
-->
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator-legacy</artifactId>
+ <version>4.0.2.GA</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
+ <version>4.0.2.GA</version>
<scope>provided</scope>
<!-- (not required at runtime) -->
</dependency>
@@ -184,7 +190,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>2.0.1-FCS</version>
+ <version>2.0.2-FCS</version>
<scope>provided</scope>
</dependency>
@@ -192,7 +198,7 @@
<dependency>
<groupId>jboss.web</groupId>
<artifactId>el-api</artifactId>
- <version>2.1.5.GA</version>
+ <version>${jboss.web.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -227,31 +233,31 @@
<!-- == 3rd Party Provided Dependencies ================ -->
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <version>3.0.0-beta-1</version>
<scope>provided</scope>
<!-- by JBossAS -->
</dependency>
<dependency>
<groupId>jboss.web</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1.5.GA</version>
+ <version>3.0.0-beta-1</version>
<scope>provided</scope>
<!-- by JBossAS -->
</dependency>
<!-- Provided in 5.0 -->
<dependency>
- <groupId>javax.xml.bind</groupId>
+ <groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
- <version>${jaxb-api.version}</version>
+ <version>${jaxb.version}</version>
<scope>provided</scope>
</dependency>
<!-- Provided in 5.0 -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>${jaxb-impl.version}</version>
+ <version>${jaxb.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-18 16:22:50 UTC (rev 866)
+++ trunk/pom.xml 2010-01-19 19:15:48 UTC (rev 867)
@@ -25,12 +25,12 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0.B01</version>
</parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.0.B01</version>
<packaging>pom</packaging>
<name>Embedded Jopr</name>
<description>a web application that provides administration and monitoring of
the app server instance to which it is deployed</description>
@@ -62,11 +62,11 @@
<seam.embedded.groupId>org.jboss.seam.embedded</seam.embedded.groupId>
<!-- dependency versions -->
- <jaxb-api.version>2.1</jaxb-api.version>
- <jaxb-impl.version>2.1.6</jaxb-impl.version>
- <jopr.version>2.4.0-SNAPSHOT</jopr.version>
+ <jaxb.version>2.1.9</jaxb.version>
+ <jboss.web.version>3.0.0-beta-1</jboss.web.version>
+ <jopr.version>1.4.0.B01</jopr.version>
<richfaces.version>3.3.3.BETA1</richfaces.version>
- <rhq.version>1.3.0.GA</rhq.version>
+ <rhq.version>1.4.0.B01</rhq.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
<!-- This is a special patched version of not-yet-released Facelets 1.1.15,
Show replies by date