Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3924] [RHQ-2070] Ugraded RHQ AS Server to 4.2.3.GA and all the supporting upgrades that go along with it.
|
From: <jsh...@rh...> - 2009-05-08 20:31:49
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3924] [RHQ-2070] Ugraded RHQ AS Server to 4.2.3.GA and all the supporting upgrades that go along with it.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3924</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2009-05-08 15:31:18 -0500 (Fri, 08 May 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-2070] Ugraded RHQ AS Server to 4.2.3.GA and all the supporting upgrades that go along with it.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkclasspath">rhq/trunk/.classpath</a></li> <li><a href="#rhqtrunketccustomserverpluginpomxml">rhq/trunk/etc/custom-serverplugin/pom.xml</a></li> <li><a href="#rhqtrunketcsamplesskeletonpluginpomxml">rhq/trunk/etc/samples/skeleton-plugin/pom.xml</a></li> <li><a href="#rhqtrunkmodulescoredomainpomxml">rhq/trunk/modules/core/domain/pom.xml</a></li> <li><a href="#rhqtrunkmodulescoreguipomxml">rhq/trunk/modules/core/gui/pom.xml</a></li> <li><a href="#rhqtrunkmodulescoreplugindocpomxml">rhq/trunk/modules/core/plugindoc/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseclientpomxml">rhq/trunk/modules/enterprise/client/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarpomxml">rhq/trunk/modules/enterprise/gui/portal-war/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseservercontainerpomxml">rhq/trunk/modules/enterprise/server/container/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml">rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarpomxml">rhq/trunk/modules/enterprise/server/jar/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserveralertenginemodelAbstractCacheElementjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserversafeinvokerpomxml">rhq/trunk/modules/enterprise/server/safe-invoker/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsclipomxml">rhq/trunk/modules/plugins/cli/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginssnmptrapdpomxml">rhq/trunk/modules/plugins/snmptrapd/pom.xml</a></li> <li><a href="#rhqtrunkpomxml">rhq/trunk/pom.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkclasspath"></a> <div class="modfile"><h4>Modified: rhq/trunk/.classpath (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/.classpath 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/.classpath 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -52,8 +52,6 @@ </span><span class="cx"> <classpathentry kind="src" path="modules/plugins/perftest/target/generated-sources/xjc"/> <classpathentry kind="src" path="modules/plugins/perftest/src/main/java"/> <classpathentry kind="src" path="modules/plugins/perftest/src/test/java"/> </span><span class="rem">- <classpathentry kind="src" path="modules/plugins/jira/target/generated-sources/axistools/wsdl2java"/> - <classpathentry kind="src" path="modules/plugins/jira/src/main/java"/> </span><span class="cx"> <classpathentry kind="src" path="modules/plugins/apt/src/test/java"/> <classpathentry kind="src" path="modules/plugins/hosts/src/test/java"/> <classpathentry kind="src" path="modules/plugins/sshd/src/main/java"/> </span><span class="lines">@@ -87,7 +85,7 @@ </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.1.GA/jboss-remoting-2.2.1.GA.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> </span><span class="lines">@@ -102,11 +100,11 @@ </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.1.GA/jboss-jmx-4.2.1.GA.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.3.GA/jboss-jmx-4.2.3.GA.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/tomcat/catalina/5.5.20/catalina-5.5.20.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common/1.2.0.GA/jboss-common-1.2.0.GA.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/struts-menu/struts-menu/2.3/struts-menu-2.3.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/> </span><span class="lines">@@ -133,20 +131,17 @@ </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/framework/richfaces-impl/3.3.0.GA/richfaces-impl-3.3.0.GA.jar" sourcepath="/M2_REPO/org/richfaces/framework/richfaces-impl/3.1.3.GA/richfaces-impl-3.1.3.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.1.3.GA/richfaces-ui-3.1.3.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/8.3-604.jdbc3/postgresql-8.3-604.jdbc3.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP3/jboss-cache-1.4.1.SP3.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.0.14/sigar-1.6.0.14.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.0.14/sigar-1.6.0.14-sources.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-jaxws/2.0.1.SP2/jboss-jaxws-2.0.1.SP2.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossws-spi/1.0.0.GA/jbossws-spi-1.0.0.GA.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossws-client/2.0.1.SP2/jbossws-client-2.0.1.SP2.jar"/> </span><span class="add">+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jbossws-client/3.0.1-native-2.0.4.GA/jbossws-client-3.0.1-native-2.0.4.GA.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/codehaus/swizzle/swizzle-confluence/1.2.Alpha1/swizzle-confluence-1.2.Alpha1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jvnet/inflector/0.7.0/inflector-0.7.0.jar"/> </span><span class="rem">- <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/axis/axis/1.4/axis-1.4.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"/> - <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar"/> </span><span class="cx"> <classpathentry exported="true" kind="var" path="M2_REPO/net/augeas/java-augeas/1.0/java-augeas-1.0.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/com/sun/jna/jna/3.0.1/jna-3.0.1.jar"/> </span></pre></div> <a id="rhqtrunketccustomserverpluginpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/etc/custom-serverplugin/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/etc/custom-serverplugin/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/etc/custom-serverplugin/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -43,7 +43,7 @@ </span><span class="cx"> <!-- TODO: This is a fix for the Javac bug requiring annotations to be available when compiling dependent classes; it is fixed in JDK 6. --> <dependency> </span><span class="rem">- <groupId>jboss-embeddable-ejb3</groupId> </span><span class="add">+ <groupId>jboss.jboss-embeddable-ejb3</groupId> </span><span class="cx"> <artifactId>hibernate-all</artifactId> <version>1.0.0.Alpha9</version> <scope>provided</scope> <!-- provided by the server/plugin-container --> </span></pre></div> <a id="rhqtrunketcsamplesskeletonpluginpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/etc/samples/skeleton-plugin/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/etc/samples/skeleton-plugin/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/etc/samples/skeleton-plugin/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -15,7 +15,7 @@ </span><span class="cx"> <description>A template for building a custom RHQ agent plugin</description> <properties> </span><span class="rem">- <rhq.version>1.1.2.GA</rhq.version> </span><span class="add">+ <rhq.version>1.2.0.GA</rhq.version> </span><span class="cx"> </properties> <dependencies> </span></pre></div> <a id="rhqtrunkmodulescoredomainpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/domain/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/domain/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/core/domain/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -40,14 +40,14 @@ </span><span class="cx"> <dependency> <groupId>hibernate</groupId> <artifactId>hibernate3</artifactId> </span><span class="rem">- <version>3.2.r14201-2</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -55,7 +55,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-entitymanager</groupId> <artifactId>hibernate-entitymanager</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span></pre></div> <a id="rhqtrunkmodulescoreguipomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/gui/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/gui/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/core/gui/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -60,7 +60,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span></pre></div> <a id="rhqtrunkmodulescoreplugindocpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/plugindoc/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/plugindoc/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/core/plugindoc/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -36,7 +36,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> </dependency> </span></pre></div> <a id="rhqtrunkmodulesenterpriseclientpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/client/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/client/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/client/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -95,60 +95,66 @@ </span><span class="cx"> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-ejb3-client</artifactId> </span><span class="rem">- <version>4.2.2.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> </dependency> </span><span class="add">+ </span><span class="cx"> <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> </span><span class="rem">- <version>4.2.2.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> </dependency> </span><span class="rem">- <dependency> - <groupId>org.opensymphony.quartz</groupId> - <artifactId>quartz</artifactId> - <version>1.6.5</version> - <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 --> - </dependency> </span><span class="add">+ <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + <!-- <version>2.0.1.SP2</version> --> + </dependency> </span><span class="cx"> </span><span class="rem">- <dependency> - <groupId>hibernate</groupId> - <artifactId>hibernate3</artifactId> - <version>3.2.r14201-1</version> - <scope>provided</scope> <!-- by JBossAS --> - </dependency> - </span><span class="add">+ <!-- needed for referenced domain entities that use Hibernate annotations --> </span><span class="cx"> <dependency> <groupId>jboss.jboss-embeddable-ejb3</groupId> <artifactId>jboss-ejb3-all</artifactId> <version>1.0.0.Alpha9</version> <scope>provided</scope> </span><span class="rem">- <!-- needed for referenced domain entities that use Hibernate annotations --> </span><span class="cx"> </dependency> </span><span class="add">+ <!-- needed for referenced domain entities that use Hibernate annotations --> </span><span class="cx"> <dependency> <groupId>jboss.jboss-embeddable-ejb3</groupId> <artifactId>hibernate-all</artifactId> <version>1.0.0.Alpha9</version> </span><span class="rem">- <scope>provided</scope> - <!-- needed for referenced domain entities that use Hibernate annotations --> </span><span class="add">+ <scope>provided</scope> </span><span class="cx"> </dependency> <dependency> </span><span class="add">+ <groupId>org.opensymphony.quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.6.5</version> + <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 --> + </dependency> + + <dependency> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> + <scope>provided</scope> <!-- by JBossAS --> + </dependency> + + <dependency> </span><span class="cx"> <groupId>xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> <version>3.0</version> </dependency> </span><span class="rem">- </span><span class="cx"> <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-common</artifactId> </span><span class="lines">@@ -156,12 +162,6 @@ </span><span class="cx"> </dependency> <dependency> </span><span class="rem">- <groupId>org.jboss</groupId> - <artifactId>jboss-jaxws</artifactId> - <version>2.0.1.SP2</version> - </dependency> - - <dependency> </span><span class="cx"> <groupId>jline</groupId> <artifactId>jline</artifactId> <version>0.9.94</version> </span><span class="lines">@@ -175,7 +175,6 @@ </span><span class="cx"> <classifier>jdk15</classifier> </dependency> </span><span class="rem">- </span><span class="cx"> </dependencies> <build> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/gui/portal-war/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -25,7 +25,6 @@ </span><span class="cx"> <!-- dependency versions --> <el.version>1.0</el.version> </span><span class="rem">- <hibernate-entitymanager.version>3.2.1.GA</hibernate-entitymanager.version> </span><span class="cx"> <jsf-facelets.version>1.1.14</jsf-facelets.version> <seam.version>2.1.0.SP1</seam.version> </span><span class="lines">@@ -132,7 +131,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate</groupId> <artifactId>hibernate3</artifactId> </span><span class="rem">- <version>3.2.r14201-2</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -140,7 +139,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-entitymanager</groupId> <artifactId>hibernate-entitymanager</artifactId> </span><span class="rem">- <version>${hibernate-entitymanager.version}</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -148,7 +147,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -213,32 +212,23 @@ </span><span class="cx"> <!-- needed for EJB3 annotations (e.g. ApplicationException) --> <dependency> <groupId>jboss</groupId> </span><span class="rem">- <artifactId>jboss-ejb-api</artifactId> - <version>${jboss.version}</version> </span><span class="add">+ <artifactId>jboss-ejb3x</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> </span><span class="rem">- <version>${jboss.version}</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="rem">- <!-- - <dependency> - <groupId>jboss.jboss-embeddable-ejb3</groupId> - <artifactId>jboss-ejb3-all</artifactId> - <version>1.0.0.Alpha9</version> - <scope>provided</scope> - </dependency> - --> - </span><span class="cx"> <!-- used by org.jboss.on.enterprise.ui.servlet.startupShutdownListener --> <dependency> <groupId>jboss</groupId> <artifactId>jboss-system</artifactId> </span><span class="rem">- <version>${jboss.version}</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -246,10 +236,26 @@ </span><span class="cx"> <dependency> <groupId>jboss</groupId> <artifactId>jbosssx</artifactId> </span><span class="rem">- <version>${jboss.version}</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="add">+ <!-- Needed due to JDK 1.5 bug. --> + <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> + <scope>provided</scope> + </dependency> + + <!-- Needed due to JDK 1.5 bug. --> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> + <scope>provided</scope> <!-- by JBossAS --> + </dependency> + </span><span class="cx"> <!-- used by DisplayTag_test.jsp --> <dependency> <groupId>junit</groupId> </span><span class="lines">@@ -381,22 +387,6 @@ </span><span class="cx"> <version>2.0.2</version> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="rem">- - <!-- Needed due to JDK 1.5 bug. --> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-jaxws</artifactId> - <version>2.0.1.SP2</version> - <scope>provided</scope> - </dependency> - - <!-- Needed due to JDK 1.5 bug. --> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-annotations-ejb3</artifactId> - <version>4.2.1.GA</version> - <scope>provided</scope> <!-- by JBossAS --> - </dependency> </span><span class="cx"> </dependencies> </span></pre></div> <a id="rhqtrunkmodulesenterpriseservercontainerpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/server/container/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -24,7 +24,6 @@ </span><span class="cx"> <scm.module.path>modules/enterprise/server/container/</scm.module.path> <!-- dependency versions --> </span><span class="rem">- <jboss.version>4.2.1.GAws201</jboss.version> </span><span class="cx"> <jboss-faces.version>4.2.3.GA</jboss-faces.version> <rhq.webappsReloadable>false</rhq.webappsReloadable> </span><span class="lines">@@ -61,9 +60,9 @@ </span><span class="cx"> </dependency> <dependency> </span><span class="rem">- <groupId>jboss</groupId> - <artifactId>jboss</artifactId> - <version>${jboss.version}</version> </span><span class="add">+ <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-dist</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <type>zip</type> </dependency> </span><span class="lines">@@ -156,6 +155,7 @@ </span><span class="cx"> <property name="jsf-api.version" value="${jsf-api.version}" /> <property name="jsf-impl.version" value="${jsf-impl.version}" /> <property name="jboss-faces.version" value="${jboss-faces.version}" /> </span><span class="add">+ <property name="hibernate3.version" value="${hibernate3.version}" /> </span><span class="cx"> <!-- dev/test DB settings (used to init rhq-server.properties if dev profile is active or developer prop is set) --> <property name="rhq.test.ds.connection-url" value="${rhq.test.ds.connection-url}" /> </span></pre></div> <a id="rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -138,7 +138,7 @@ </span><span class="cx"> <echo>*** Preparing jbossas dir... ***</echo> <!-- Unzip vanilla JBoss dist zipfile... --> </span><span class="rem">- <property name="jboss.zip" location="${settings.localRepository}/jboss/jboss/${jboss.version}/jboss-${jboss.version}.zip" /> </span><span class="add">+ <property name="jboss.zip" location="${settings.localRepository}/org/jboss/jbossas/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip" /> </span><span class="cx"> <condition property="jboss.uptodate"> <and> <uptodate srcfile="${jboss.zip}" targetfile="${jboss.home}" /> </span><span class="lines">@@ -165,8 +165,16 @@ </span><span class="cx"> <copy file="${basedir}/src/main/resources/jbossas/server/default/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" toDir="${jboss.deploy.dir}/jbossws.sar/jbossws.beans/META-INF" verbose="true" /> </span><span class="rem">- <echo>Installing patched hibernate jar ...</echo> - <copy file="${settings.localRepository}/hibernate/hibernate3/3.2.r14201-2/hibernate3-3.2.r14201-2.jar" </span><span class="add">+ <echo>Installing jgroups jar ...</echo> + <copy file="${jboss.home}/server/all/lib/jgroups.jar" + tofile="${jboss.home}/server/default/lib/jgroups.jar" verbose="true"/> + + <echo>Installing jboss cache jar ...</echo> + <copy file="${jboss.home}/server/all/lib/jboss-cache-jdk50.jar" + tofile="${jboss.home}/server/default/lib/jboss-cache-jdk50.jar" verbose="true"/> + + <echo>Installing patched hibernate jar ...</echo> + <copy file="${settings.localRepository}/hibernate/hibernate3/${hibernate3.version}/hibernate3-${hibernate3.version}.jar" </span><span class="cx"> tofile="${jboss.home}/server/default/lib/hibernate3.jar" verbose="true"/> <echo>Installing custom container library...</echo> </span><span class="lines">@@ -304,13 +312,13 @@ </span><span class="cx"> <echo>Enabling server to run on Java 6 ...</echo> <move todir="${jboss.home}/lib/endorsed" verbose="true"> </span><span class="rem">- <fileset dir="${jboss.deploy.dir}/jbossws.sar"> - <include name="jaxb-api.jar" /> - <include name="jaxb-impl.jar" /> - <include name="jboss-jaxrpc.jar" /> - <include name="jboss-jaxws.jar" /> - <include name="jboss-saaj.jar" /> - </fileset> </span><span class="add">+ <fileset dir="${jboss.home}/client"> + <include name="jboss-jaxrpc.jar" /> + <include name="jboss-jaxws.jar" /> + <include name="jboss-jaxws-ext.jar" /> + <include name="jboss-saaj.jar" /> + <include name="jaxb-api.jar" /> + </fileset> </span><span class="cx"> <fileset dir="${jboss.home}/server/default/lib"> <include name="activation.jar" /> </fileset> </span><span class="lines">@@ -511,7 +519,7 @@ </span><span class="cx"> </target> <target name="unzip-jboss" unless="jboss.uptodate"> </span><span class="rem">- <unzip src="${settings.localRepository}/jboss/jboss/${jboss.version}/jboss-${jboss.version}.zip" </span><span class="add">+ <unzip src="${settings.localRepository}/org/jboss/jbossas/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip" </span><span class="cx"> dest="${basedir}/target" /> <delete dir="${jboss.home}" /> <move file="${basedir}/target/jboss-${jboss.version}" tofile="${jboss.home}" /> </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/server/jar/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -111,14 +111,14 @@ </span><span class="cx"> <dependency> <groupId>hibernate</groupId> <artifactId>hibernate3</artifactId> </span><span class="rem">- <version>3.2.r14201-2</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -153,56 +153,56 @@ </span><span class="cx"> <dependency> <groupId>jboss</groupId> <artifactId>jboss-annotations-ejb3</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-cache</artifactId> </span><span class="rem">- <version>1.4.1.SP3</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>compile</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-common</artifactId> </span><span class="rem">- <version>1.2.0.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> </span><span class="rem">- <artifactId>jboss-ejb-api</artifactId> - <version>4.2.1.GA</version> </span><span class="add">+ <artifactId>jboss-ejb3x</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-jmx</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-system</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jbosssx</artifactId> </span><span class="rem">- <version>4.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="lines">@@ -216,10 +216,24 @@ </span><span class="cx"> <dependency> <groupId>org.jboss.transaction</groupId> <artifactId>jboss-jta</artifactId> </span><span class="rem">- <version>4.2.3.SP5</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span><span class="add">+ <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jboss-jaxws</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>jboss.jbossws</groupId> + <artifactId>jbossws-client</artifactId> + <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> + <scope>provided</scope> + </dependency> + </span><span class="cx"> <!-- TODO: remove this - tests should all be moved under the test source tree --> <dependency> <groupId>junit</groupId> </span><span class="lines">@@ -289,19 +303,6 @@ </span><span class="cx"> <scope>provided</scope> </dependency> </span><span class="rem">- <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-jaxws</artifactId> - <version>2.0.1.SP2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossws-client</artifactId> - <version>2.0.1.SP2</version> - <scope>provided</scope> - </dependency> - </span><span class="cx"> <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. --> <dependency> <groupId>xalan</groupId> </span><span class="lines">@@ -331,14 +332,14 @@ </span><span class="cx"> <dependency> <groupId>hibernate-entitymanager</groupId> <artifactId>hibernate-entitymanager</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>test</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>javassist</artifactId> </span><span class="rem">- <version>3.4.ga</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>test</scope> </dependency> </span><span class="lines">@@ -576,6 +577,7 @@ </span><span class="cx"> <artifactId>maven-surefire-plugin</artifactId> <configuration> <groups>ws</groups> </span><span class="add">+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> </span><span class="cx"> <excludes> <exclude>com/**/*.java</exclude> </excludes> </span><span class="lines">@@ -589,11 +591,7 @@ </span><span class="cx"> </systemProperties> <additionalClasspathElements> <!-- The below is required for WS Java Client support --> </span><span class="rem">- <additionalClasspathElement>${jbossws-native-home}/deploy/lib/jbossws-spi.jar</additionalClasspathElement> - <additionalClasspathElement>${jbossws-native-home}/deploy/lib/jbossws-common.jar</additionalClasspathElement> - <additionalClasspathElement>${jbossws-native-home}/deploy/lib/jbossws-native-saaj.jar</additionalClasspathElement> - <additionalClasspathElement>${jbossws-native-home}/deploy/lib/wsdl4j.jar</additionalClasspathElement> - <additionalClasspathElement>${jbossws-native-home}/deploy/lib/policy.jar</additionalClasspathElement> </span><span class="add">+ <additionalClasspathElement>${jbossws-native-home}/deploy/lib/jbossws-client.jar</additionalClasspathElement> </span><span class="cx"> </additionalClasspathElements> </configuration> </plugin> </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserveralertenginemodelAbstractCacheElementjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -21,13 +21,10 @@ </span><span class="cx"> import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; </span><span class="rem">-import org.jboss.cache.aop.annotation.InstanceOfPojoCacheable; - </span><span class="cx"> /** * @author Joseph Marques */ </span><span class="rem">-@InstanceOfPojoCacheable </span><span class="cx"> public abstract class AbstractCacheElement<T> { protected final Log log = LogFactory.getLog(getClass()); </span></pre></div> <a id="rhqtrunkmodulesenterpriseserversafeinvokerpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/safe-invoker/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/safe-invoker/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/enterprise/server/safe-invoker/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -27,9 +27,9 @@ </span><span class="cx"> <dependencies> <dependency> </span><span class="rem">- <groupId>org.jboss</groupId> </span><span class="add">+ <groupId>jboss.jbossws</groupId> </span><span class="cx"> <artifactId>jbossws-client</artifactId> </span><span class="rem">- <version>2.0.1.SP2</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> </dependency> <dependency> </span><span class="lines">@@ -41,7 +41,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate</groupId> <artifactId>hibernate3</artifactId> </span><span class="rem">- <version>3.2.r14201-2</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- by JBossAS --> </dependency> </span></pre></div> <a id="rhqtrunkmodulespluginsclipomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/cli/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/cli/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/plugins/cli/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -63,7 +63,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> <!-- provided by the agent/plugin-container --> </dependency> </span></pre></div> <a id="rhqtrunkmodulespluginssnmptrapdpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/snmptrapd/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/snmptrapd/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/modules/plugins/snmptrapd/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -203,7 +203,7 @@ </span><span class="cx"> <dependency> <groupId>hibernate-annotations</groupId> <artifactId>hibernate-annotations</artifactId> </span><span class="rem">- <version>3.2.1.GA</version> </span><span class="add">+ <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="cx"> <scope>provided</scope> </dependency> <dependency> </span></pre></div> <a id="rhqtrunkpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/pom.xml (3923 => 3924)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/pom.xml 2009-05-08 15:32:30 UTC (rev 3923) +++ rhq/trunk/pom.xml 2009-05-08 20:31:18 UTC (rev 3924) </span><span class="lines">@@ -44,15 +44,29 @@ </span><span class="cx"> <java5.home>${java.home}</java5.home> <!-- dependency versions --> </span><span class="add">+ + <!-- Start: JBoss AS Dependency Versions + The dependency versions below are declared together as the versions of each are dependent on the + overall JBoss AS Server version. Meaning, the AS provides these libs. When the Server + version is changed the versions of each of these should be validated and updated as needed. --> + <jboss.version>4.2.3.GA</jboss.version> + <jboss-cache.version>1.4.1.SP9</jboss-cache.version> + <jboss-common.version>1.2.1.GA</jboss-common.version> + <jboss-jta.version>4.2.3.SP7</jboss-jta.version> + <jboss-remoting.version>2.2.2.SP8</jboss-remoting.version> + <jboss-serialization.version>1.0.3.GA</jboss-serialization.version> + <jboss-javassist.version>3.8.0.GA</jboss-javassist.version> + <jbossws.version>3.0.1-native-2.0.4.GA</jbossws.version> + <!-- End: JBoss AS Dependency Versions --> + </span><span class="cx"> <commons-logging.version>1.1.0.jboss</commons-logging.version> </span><span class="rem">- <concurrent.version>1.3.4-jboss</concurrent.version> </span><span class="add">+ <concurrent.version>1.3.4-jboss-update1</concurrent.version> <!-- oswego-concurrent compatible with 4.2.3.GA --> </span><span class="cx"> <getopt.version>1.0.13</getopt.version> </span><span class="add">+ <hibernate3.version>3.2.r14201-2</hibernate3.version> + <hibernate-annotations.version>3.2.1.GA</hibernate-annotations.version> + <hibernate-entitymanager.version>3.2.1.GA</hibernate-entitymanager.version> </span><span class="cx"> <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> </span><span class="rem">- <jboss.version>4.2.1.GA</jboss.version> - <jboss-common.version>1.2.0.GA</jboss-common.version> - <jboss-remoting.version>2.2.1.GA</jboss-remoting.version> <!-- version that ships w/ AS 4.2.1.GA --> - <jboss-serialization.version>1.0.3.GA</jboss-serialization.version> <!-- version that ships w/ AS 4.2.1.GA --> </span><span class="cx"> <jsf-api.version>1.2_12</jsf-api.version> <jsf-impl.version>1.2_12</jsf-impl.version> <ojdbc14.version>10.2.0.4.0</ojdbc14.version> </span><span class="lines">@@ -93,7 +107,116 @@ </span><span class="cx"> <dependencies> </span><span class="add">+ <!-- Start: JBoss AS Dependencies + The dependencies below are declared together as the versions of each are dependent on the + overall JBoss AS Server version. Meaning, the AS provides these libs. When the Server + version is changed the versions of each of these should be validated and updated as needed. --> </span><span class="cx"> <dependency> </span><span class="add">+ <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-dist</artifactId> + <version>${jboss.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-all-client</artifactId> + <version>${jboss.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-cache</artifactId> + <version>${jboss-cache.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common</artifactId> + <version>${jboss-common.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>${jboss.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3-client</artifactId> + <version>${jboss.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <version>${jboss.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + <version>${jboss-javassist.version}</version> + </dependency> + + <dependency> + <groupId>jboss</groupId... [truncated message content] |