9:57 a.m.
Author: ips
Date: 2012-05-07 10:57:59 -0400 (Mon, 07 May 2012)
New Revision: 1045
Modified:
trunk/core/pom.xml
trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml
trunk/core/src/main/webapp/WEB-INF/web.xml
trunk/core/src/main/webapp/login.xhtml
trunk/jbas6/pom.xml
trunk/pom.xml
Log:
upgrade to RHQ 4.3 and to latest versions of the hornetq and infinispan plugins; remove
the old JBoss repo from the pom
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -1,6 +1,6 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2012-04-10 01:08:56 UTC (rev
1044)
+++ trunk/core/src/main/webapp/WEB-INF/facelets/header.xhtml 2012-05-07 14:57:59 UTC (rev
1045)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
@@ -71,4 +71,4 @@
</div>
</ui:composition>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/core/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/web.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/src/main/webapp/WEB-INF/web.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -2,7 +2,7 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/core/src/main/webapp/login.xhtml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -2,7 +2,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
Modified: trunk/jbas6/pom.xml
===================================================================
--- trunk/jbas6/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/jbas6/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -77,13 +77,13 @@
<artifactItem>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jopr-plugin</artifactId>
- <version>2.0.0.CR1</version>
+ <version>2.0.0.Final</version>
</artifactItem>
<artifactItem>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-jopr-plugin</artifactId>
- <version>4.2.0.CR4</version>
+ <version>4.2.1.FINAL</version>
</artifactItem>
</artifactItems>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-04-10 01:08:56 UTC (rev 1044)
+++ trunk/pom.xml 2012-05-07 14:57:59 UTC (rev 1045)
@@ -1,6 +1,6 @@
<!--
~ Embedded Jopr Project
- ~ Copyright (C) 2006-2010 Red Hat, Inc.
+ ~ Copyright (C) 2006-2012 Red Hat, Inc.
~ All rights reserved.
~
~ This program is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0</version>
+ <version>4.3.0</version>
</parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.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>
@@ -70,7 +70,7 @@
<jaxb.version>2.1.9</jaxb.version>
<jboss.web.version>3.0.0-beta-2</jboss.web.version>
<richfaces.version>3.3.3.Final</richfaces.version>
- <rhq.version>3.0.0</rhq.version>
+ <rhq.version>4.3.0</rhq.version>
<jopr.version>${rhq.version}</jopr.version>
<seam.version>2.1.0.SP1</seam.version>
<seam.embedded.version>beta3.SP3</seam.embedded.version>
@@ -142,23 +142,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>read-build-properties</id>
- <phase>process-resources</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files />
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -177,16 +160,6 @@
<repositories>
- <!-- TODO: Do we still need this? -->
- <repository>
- <id>jboss-old</id>
- <name>JBoss Old</name>
- <url>https://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
<!-- for the RHQ jars -->
<repository>
<id>jboss-releases</id>