[embjopr-commits] EMBJOPR SVN: r344 - in trunk: jbas4 and 2 other directories.

[embjopr-commits at lists.jboss.org]

Author: ips
Date: 2009-04-27 10:18:38 -0400 (Mon, 27 Apr 2009)
New Revision: 344

Modified:
   trunk/jbas4/pom.xml
   trunk/jbas5/pom.xml
   trunk/jsfunit/pom.xml
   trunk/pom.xml
Log:
fix up some issues in the poms


Modified: trunk/jbas4/pom.xml
===================================================================
--- trunk/jbas4/pom.xml	2009-04-27 13:46:03 UTC (rev 343)
+++ trunk/jbas4/pom.xml	2009-04-27 14:18:38 UTC (rev 344)
@@ -64,19 +64,19 @@
                                     <version>${rhq.version}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>${jon.groupId}</groupId>
+                                    <groupId>${jopr.groupId}</groupId>
                                     <artifactId>jopr-hibernate-plugin</artifactId>
-                                    <version>${jon.version}</version>
+                                    <version>${jopr.version}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>${jon.groupId}</groupId>
+                                    <groupId>${jopr.groupId}</groupId>
                                     <artifactId>jopr-jboss-as-plugin</artifactId>
-                                    <version>${jon.version}</version>
+                                    <version>${jopr.version}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>${jon.groupId}</groupId>
+                                    <groupId>${jopr.groupId}</groupId>
                                     <artifactId>jopr-tomcat-plugin</artifactId>
-                                    <version>${jon.version}</version>
+                                    <version>${jopr.version}</version>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml	2009-04-27 13:46:03 UTC (rev 343)
+++ trunk/jbas5/pom.xml	2009-04-27 14:18:38 UTC (rev 344)
@@ -52,9 +52,9 @@
                             <outputDirectory>${warDir}/plugins</outputDirectory>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>${jon.groupId}</groupId>
+                                    <groupId>${jopr.groupId}</groupId>
                                     <artifactId>jopr-jboss-as-5-plugin</artifactId>
-                                    <version>${jon.version}</version>
+                                    <version>${jopr.version}</version>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

Modified: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml	2009-04-27 13:46:03 UTC (rev 343)
+++ trunk/jsfunit/pom.xml	2009-04-27 14:18:38 UTC (rev 344)
@@ -16,8 +16,7 @@
    </parent>
 
    <groupId>org.jboss.jopr</groupId>
-   <artifactId>jopr-embedded-jsfunit</artifactId>
-   <version>${jopr.version}</version>
+   <artifactId>jopr-embedded-jsfunit</artifactId>   
    <packaging>war</packaging>
    <name>JSFUnit Tests for Embedded Admin Console</name>
 
@@ -256,7 +255,7 @@
             <dependency>
                <groupId>org.jboss.jopr</groupId>
                <artifactId>jopr-embedded-jbas5</artifactId>
-               <version>${jopr.version}</version><!-- ${project.version} -->
+               <version>${project.version}</version>
                <type>war</type>
             </dependency>
             <dependency>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-27 13:46:03 UTC (rev 343)
+++ trunk/pom.xml	2009-04-27 14:18:38 UTC (rev 344)
@@ -30,7 +30,7 @@
 
     <groupId>org.jboss.jopr</groupId>
     <artifactId>jopr-embedded-parent</artifactId>
-    <version>1.2.0.CR2</version>
+    <version>1.2.0-SNAPSHOT</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>
@@ -57,14 +57,14 @@
 
         <!-- dependency groupIds -->
         <rhq.groupId>org.rhq</rhq.groupId>
-        <jon.groupId>org.jboss.on</jon.groupId>
+        <jopr.groupId>org.jboss.on</jopr.groupId>
         <seam.groupId>org.jboss.seam</seam.groupId>
         <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>
-        <jon.version>2.2.0.CR2</jon.version>
+        <jaxb-impl.version>2.1.6</jaxb-impl.version>        
+        <jopr.version>2.2.0.CR2</jopr.version>
         <richfaces.version>3.3.0.GA</richfaces.version>
         <rhq.version>1.2.0.CR2</rhq.version>
         <seam.version>2.1.0.SP1</seam.version>