September 2013 - rhq-commits - Fedora Mailing-Lists

by Jay Shaughnessy

modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 12 +++++----- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit bfb7aabc5a20c50ad3ecaee9e9c2f15f16a737e1 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 26 10:48:36 2013 -0400 Update newly committed code with the storage prop name changes. diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index 3d56c60..aca83c6 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -482,9 +482,9 @@ public abstract class AbstractInstall extends ControlCommand { File basedirForData = new File(getBaseDir().getParentFile(), "rhq-data"); // check that the data directories are set and convert to absolute dirs - File dataDirProp = new File(storageProperties.getProperty("data", "data")); - File commitlogDirProp = new File(storageProperties.getProperty("commitlog", "commit_log")); - File savedcachesDirProp = new File(storageProperties.getProperty("saved-caches", "saved_caches")); + File dataDirProp = new File(storageProperties.getProperty("rhq.storage.data", "data")); + File commitlogDirProp = new File(storageProperties.getProperty("rhq.storage.commitlog", "commit_log")); + File savedcachesDirProp = new File(storageProperties.getProperty("rhq.storage.saved-caches", "saved_caches")); if (!dataDirProp.isAbsolute()) { dataDirProp = new File(basedirForData, dataDirProp.getPath()); @@ -518,9 +518,9 @@ public abstract class AbstractInstall extends ControlCommand { if (rhqctlCommandLine.hasOption(STORAGE_DATA_ROOT_DIR)) { StorageDataDirectories dataDirs; dataDirs = getCustomStorageDataDirectories(rhqctlCommandLine); - storageProperties.setProperty("data", dataDirs.dataDir.getAbsolutePath()); - storageProperties.setProperty("commitlog", dataDirs.commitlogDir.getAbsolutePath()); - storageProperties.setProperty("saved-caches", dataDirs.savedcachesDir.getAbsolutePath()); + storageProperties.setProperty("rhq.storage.data", dataDirs.dataDir.getAbsolutePath()); + storageProperties.setProperty("rhq.storage.commitlog", dataDirs.commitlogDir.getAbsolutePath()); + storageProperties.setProperty("rhq.storage.saved-caches", dataDirs.savedcachesDir.getAbsolutePath()); } // add the properties set in rhq-storage.properties to the command line

10 years, 7 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - code-coverage/pom.xml modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by Simeon Pinder

code-coverage/pom.xml | 2 +- modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/cassandra-auth/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml | 2 +- modules/common/cassandra-ccm/pom.xml | 2 +- modules/common/cassandra-installer/pom.xml | 2 +- modules/common/cassandra-schema/pom.xml | 2 +- modules/common/cassandra-util/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as-dmr-client/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/arquillian-integration/suite-extension/pom.xml | 2 +- modules/core/arquillian-integration/test-agent-plugin/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/remoting-war/pom.xml | 2 +- modules/enterprise/gui/rest-examples-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/scripting/api/pom.xml | 4 ++-- modules/enterprise/scripting/javascript/pom.xml | 4 ++-- modules/enterprise/scripting/pom.xml | 4 ++-- modules/enterprise/scripting/python/pom.xml | 4 ++-- modules/enterprise/server/appserver/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/data-migration/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/installer/pom.xml | 2 +- modules/enterprise/server/itests-2/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/alertdef-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/server-control/pom.xml | 2 +- modules/enterprise/server/server-metrics/pom.xml | 2 +- modules/enterprise/server/startup-subsystem/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/metrics-simulator/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rest-docs-generator/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/integration-tests/rest-api/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/byteman/pom.xml | 2 +- modules/plugins/cassandra/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/noop/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/rhq-storage/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sonarqube/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 158 files changed, 179 insertions(+), 179 deletions(-) New commits: commit 067e1fae156247c31c154e86776292a8cdec068d Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Sep 26 10:39:37 2013 -0400 Revert "tag RHQ_4_7_0_JONCI" This reverts commit e2150bf14a3333c336b91e2077e54e685cb15188. diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 4aae357..9783c17 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 434edad..df3c6b7 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 86baa5a..e27e9ae 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index 5195e6e..ad356e9 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index dc9fcac..1ee2365 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index b84d36c..86298a7 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 8640d5b..4b78cec 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index b817c60..7a5bf61 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 1b8bc61..44e3f9e 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index fac3833..0c341cd 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index c62a28f..1a4e928 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 800f5d1..18d2ef8 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index d3baf3b..a97a3f1 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 93f3805..a22d463 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index ef791fb..cf49eb0 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 866f669..bff6e36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d31a6ad..8a4966b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index f4b2afa..fefcf36 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 33e48b1..832fdd3 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 66df7dd..f6638aa 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index bbe0954..fd8e278 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index b560968..474988c 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index a06011c..cdb3121 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index ff8a21b..b3bcfd0 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 83c9dac..ce66cca 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index b59e15e..ab06e9e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 710a585..e25a193 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 86a3e7e..d076cd9 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index adf5bd4..fdf355f 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 2ed4c26..8cb5215 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index e03ac78..57987fd 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 97ed3ab..a619439 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index b2c1184..143ce73 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0820f4b..72e7d1b 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index ecdde93..24a00ee 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9765a55..dcbfd30 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2d97b0b..4935618a 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index c832b41..fcd9b26 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c0554c6..20854c9 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 4d3b17e..8cd2d97 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index f3e07b4..0a1e19b 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 1ea7d61..e3de1bc 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index d418db5..908c109 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 57c01e8..578f0ed 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index b418671..cf9088d 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 53a1556..4e7d74c 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 0ab8d0e..b946b2b 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 22ee22b..b6a7a04 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 300e679..1eac425 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 427c5fb..d8527f8 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 49e0186..ed18648 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index a087cb1..982d3d3 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index bbd87da..d445ed7 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 4b4ba59..575a004 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index aac6e73..f469ca5 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 4c47992..50ab4c3 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 1e36d6c..7ef3212 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 61830f3..83d7b23 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 12215be..91a653b 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 1af4fa8..58a16f2 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index f35a0a4..6a4b21c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index c9c0a03..04dc335 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 7af6f9d..f9f2e6a 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4d8a07d..3f7c17a 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index abc220d..44d1b10 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 20c07de..dc9d767 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 471003a..e81935a 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 2457b0d..a1a6f8b 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index d620c92..d32dddd 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 7e3cbe7..eb14068 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 54dcd5b..3e00528 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 317e61b..39b5ca5 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 36e246a..12758b4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 5551c92..6aab82f 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 6f7ac53..56ad7b6 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8edfd9b..1ef821f 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 32acda7..21145a5 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 02fd80d..82c6669 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 8689924..7259db3 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 5833fee..e497a9c 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7211f4c..c7caff8 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 13b66fe..93fe1f4 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index c86f705..7d1797b 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 6b28aa9..117271d 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 32d9a39..2449ed8 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index a6cdea1..fd56fff 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index bca927d..1e9b481 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index bb51ace..9c2ccf4 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 713b1b4..0c9d27c 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 0d39f8e..7d57760 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index fc766fe..03c2ce5 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index edf7c87..6350464 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index e63e38e..768ec0a 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index a7ed4cc..dd97e8f 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 545b5db..26c709d 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 718c14c..36e76d8 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index fa787c5..d5bd8e7 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 84ef130..9630bc8 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 0567602..c31b804 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index df8b7ef..63f1e62 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index ca3d81f..77ed069 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0b0c363..0a616d3 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 5e1f84c..4510e72 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 777f236..8038922 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index ac50627..da1ad51 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 7c5748d..556c1e4 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index a7b8e47..523406f 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 7c2d095..167ab67 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0c23814..a89a568 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 71c5eca..f96b173 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 56452fb..679f9b3 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 6d5887e..e16b1fd 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index ddc9e9e..bc7bca1 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 5f332a0..0edf971 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 2f42e79..9446a83 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index dd1d4a3..92dace7 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d252d6c..ebdb5c0 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a10b0f8..a3f17f4 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 0d0eefa..44ac23f 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index e0e3cdc..a9e7295 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b31fd66..092ac13 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index aaa9aa2..6853c1a 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index a35e582..b32ee81 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 725187f..dc08424 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 00d0bda..f4a7a88 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 1c8fe0f..993a215 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 513f5b4..44e9ce9 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 69b26bf..a8e46d8 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6e2414b..18e79f9 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index ac3304d..c3c0db9 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index bab062b..206f2d7 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 21102b3..c1a9f61 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index c45ff85..9678528 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index a7df5f9..06b5a80 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 6f8216c..cd0c446 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6ac7fb2..2160f12 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 766df02..1b10af4 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 930f335..4e18f5f 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index ba2069c..51af020 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index bf6fe94..feb87c4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 0cc62a9..bb904517 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 4989446..414a2c4 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index a579f86..f373663 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 834091d..942836c 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index b3fce75..9269350 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 1f52ac4..c018eed 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 539f1b9..b2c4587 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index ee7b2fd..404f7d6 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index 834b985..fb12b85 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index b9f2b39..9f53f6f 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index beb0dd1..764fe67 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f9bd9b1..f043ba1 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 45d589a..67c4519 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index f46c475..01d0d24 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 678e67f..7fbac03 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 70e298a..41280b9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3407cad..3d4ed73 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index b3d1503..c305a40 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <packaging>pom</packaging> <name>RHQ</name>

10 years, 7 months

1
0
0 / 0

[rhq] modules/common modules/enterprise modules/plugins

by Jay Shaughnessy

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml | 26 - modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.log4j-server.properties | 39 - modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java | 4 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java | 149 +++--- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties | 54 +- modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java | 31 - modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml | 2 modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java | 11 modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 220 +++++----- modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 77 ++- modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 92 ++-- modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy | 18 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 6 modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java | 8 15 files changed, 386 insertions(+), 353 deletions(-) New commits: commit 8a5c8c38a145d0521d019360e3f2526f7604b1fa Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 26 10:11:23 2013 -0400 Normalize storage props to be prefixed with "rhq.storage." and use the props consistently, removing different names for the same logical value. Also: - remove the sslStoragePort setting, it was not actually supported - improve some comments in the generated rhq-storage.properties file. diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml index 94ff227..97f6926 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.cassandra.yaml @@ -21,7 +21,7 @@ cluster_name: ${cluster.name} # # If you already have a cluster with 1 token per node, and wish to migrate to # multiple tokens per node, see http://wiki.apache.org/cassandra/Operations -num_tokens: ${rhq.cassandra.num_tokens} +num_tokens: ${rhq.storage.num_tokens} # If you haven't specified num_tokens, or have set it to the default of 1 then # you should always specify InitialToken when setting up a production @@ -66,7 +66,7 @@ max_hints_delivery_threads: 2 # - PasswordAuthenticator relies on username/password pairs to authenticate # users. It keeps usernames and hashed passwords in system_auth.credentials table. # Please increase system_auth keyspace replication factor if you use this authenticator. -authenticator: ${rhq.cassandra.authenticator} +authenticator: ${rhq.storage.authenticator} # Authorization backend, implementing IAuthorizer; used to limit access/provide permissions # Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, @@ -75,7 +75,7 @@ authenticator: ${rhq.cassandra.authenticator} # - AllowAllAuthorizer allows any action to any user - set it to disable authorization. # - CassandraAuthorizer stores permissions in system_auth.permissions table. Please # increase system_auth keyspace replication factor if you use this authorizer. -authorizer: ${rhq.cassandra.authorizer} +authorizer: ${rhq.storage.authorizer} # Validity period for permissions cache (fetching permissions can be an # expensive operation depending on the authorizer, CassandraAuthorizer is @@ -110,10 +110,10 @@ partitioner: org.apache.cassandra.dht.Murmur3Partitioner # will spread data evenly across them, subject to the granularity of # the configured compaction strategy. data_file_directories: - - ${rhq.cassandra.data.dir} + - ${rhq.storage.data} # commit log -commitlog_directory: ${rhq.cassandra.commitlog.dir} +commitlog_directory: ${rhq.storage.commitlog} # policy for data disk failures: # stop: shut down gossip and Thrift, leaving the node effectively dead, but @@ -193,7 +193,7 @@ row_cache_save_period: 0 row_cache_provider: SerializingCacheProvider # saved caches -saved_caches_directory: ${rhq.cassandra.saved.caches.dir} +saved_caches_directory: ${rhq.storage.saved-caches} # commitlog_sync may be either "periodic" or "batch." # When in batch mode, Cassandra won't ack writes until the commit log @@ -232,7 +232,7 @@ seed_provider: parameters: # seeds is actually a comma-delimited list of addresses. # Ex: "<ip1>,<ip2>,<ip3>" - - seeds: "${rhq.cassandra.seeds}" + - seeds: "${rhq.storage.seeds}" # emergency pressure valve: each time heap usage after a full (CMS) # garbage collection is above this fraction of the max, Cassandra will @@ -307,11 +307,11 @@ trickle_fsync: false trickle_fsync_interval_in_kb: 10240 # TCP port, for commands and data -storage_port: ${rhq.cassandra.storage.port} +storage_port: ${rhq.storage.gossip-port} # SSL port, for encrypted communication. Unused unless enabled in # encryption_options -ssl_storage_port: ${rhq.cassandra.ssl.storage.port} +ssl_storage_port: 7101 # Address to bind to and tell other Cassandra nodes to connect to. You # _must_ change this if you want multiple nodes to be able to @@ -323,7 +323,7 @@ ssl_storage_port: ${rhq.cassandra.ssl.storage.port} # address associated with the hostname (it might not be). # # Setting this to 0.0.0.0 is always wrong. -listen_address: ${rhq.cassandra.listen.address} +listen_address: ${rhq.storage.listen.address} # Address to broadcast to other Cassandra nodes # Leaving this blank will set it to the same value as listen_address @@ -340,7 +340,7 @@ internode_authenticator: org.rhq.cassandra.auth.RhqInternodeAuthenticator # same as the rpc_address. The port however is different and specified below. start_native_transport: true # port for the CQL native transport to listen for clients on -native_transport_port: ${rhq.cassandra.native_transport_port} +native_transport_port: ${rhq.storage.cql-port} # NOTE: native_transport_min_threads is now deprecated and ignored (but kept # in the 1.2.x series for compatibility sake). # The minimum and maximum threads for handling requests when the native @@ -350,7 +350,7 @@ native_transport_port: ${rhq.cassandra.native_transport_port} # native_transport_max_threads: 128 # Whether to start the thrift rpc server. -start_rpc: ${rhq.cassandra.start_rpc} +start_rpc: ${rhq.storage.start_rpc} # The address to bind the Thrift RPC service and native transport # server -- clients connect here. @@ -364,7 +364,7 @@ start_rpc: ${rhq.cassandra.start_rpc} # client drivers. rpc_address: ${rpc.address} # port for Thrift to listen for clients on -rpc_port: ${rhq.cassandra.rpc_port} +rpc_port: ${rhq.storage.rpc_port} # enable or disable keepalive on rpc connections rpc_keepalive: true diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.log4j-server.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.log4j-server.properties index e1b3cd4..fcea1b3 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.log4j-server.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/bundle/cassandra/conf/rhq.log4j-server.properties @@ -13,33 +13,26 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -# for production, you should probably set pattern to %c instead of %l. -# (%l is slower.) - -# output messages into a rolling log file as well as stdout -log4j.rootLogger=${rhq.cassandra.logging.level},stdout,R - -# stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n - # rolling log file -log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.maxFileSize=20MB -log4j.appender.R.maxBackupIndex=50 -log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n +log4j.appender.R = org.apache.log4j.RollingFileAppender # Edit the next line to point to your logs directory -log4j.appender.R.File=${rhq.cassandra.log.file} -log4j.appender.R.Threshold=${rhq.cassandra.logging.level} - +log4j.appender.R.File = ${rhq.storage.log.file} +log4j.appender.R.Threshold = ${rhq.storage.logging.level} +log4j.appender.R.layout = org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern = %5p [%t] %d{ISO8601} %F (line %L) %m%n +log4j.appender.R.maxBackupIndex = 50 +log4j.appender.R.maxFileSize = 20MB +# stdout +log4j.appender.stdout = org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout = org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern = %5p %d{HH:mm:ss,SSS} %m%n # Application logging options #log4j.logger.org.apache.cassandra=DEBUG #log4j.logger.org.apache.cassandra.db=DEBUG #log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG - # Adding this to avoid thrift logging disconnect errors. -log4j.logger.org.apache.thrift.server.TNonblockingServer=ERROR - +log4j.logger.org.apache.thrift.server.TNonblockingServer = ERROR +# for production, you should probably set pattern to %c instead of %l. +# (%l is slower.) +# output messages into a rolling log file as well as stdout +log4j.rootLogger = ${rhq.storage.logging.level},stdout,R diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java index 4a02e1d..a49d77d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/CassandraClusterManager.java @@ -144,7 +144,7 @@ public class CassandraClusterManager { this.nodes = new String[deploymentOptions.getNumNodes()]; this.jmxPorts = new int[deploymentOptions.getNumNodes()]; - this.cqlPort = deploymentOptions.getNativeTransportPort(); + this.cqlPort = deploymentOptions.getCqlPort(); for (int i = 0; i < deploymentOptions.getNumNodes(); ++i) { File basedir = new File(deploymentOptions.getClusterDir(), "node" + i); @@ -240,7 +240,7 @@ public class CassandraClusterManager { this.jmxPorts[i] = deploymentOptions.getJmxPort() + i; } - this.cqlPort = deploymentOptions.getNativeTransportPort(); + this.cqlPort = deploymentOptions.getCqlPort(); } public void startCluster() { diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java index 36620c2..cbe408d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptions.java @@ -73,7 +73,7 @@ public class DeploymentOptions { private Boolean embedded; private String loggingLevel; private Integer numTokens; - private Integer nativeTransportPort; + private Integer cqlPort; private Boolean startRpc; private Integer rpcPort; private Integer nativeTransportMaxThreads; @@ -87,8 +87,7 @@ public class DeploymentOptions { private String listenAddress; private String rpcAddress; private Integer jmxPort; - private Integer storagePort; - private Integer sslStoragePort; + private Integer gossipPort; private String seeds; private String heapSize; private String heapNewSize; @@ -138,34 +137,38 @@ public class DeploymentOptions { setUsername(loadProperty("rhq.storage.username", properties)); setPassword(loadProperty("rhq.storage.password", properties)); - setClusterDir(loadProperty("rhq.cassandra.cluster.dir", properties)); - setNumNodes(Integer.parseInt(loadProperty("rhq.cassandra.cluster.num-nodes", properties))); - setEmbedded(Boolean.valueOf(loadProperty("rhq.cassandra.cluster.is-embedded", properties))); - setLoggingLevel(loadProperty("rhq.cassandra.logging.level", properties)); + setBasedir(loadProperty("rhq.storage.basedir", properties)); + setClusterDir(loadProperty("rhq.storage.cluster.dir", properties)); + setNumNodes(Integer.parseInt(loadProperty("rhq.storage.cluster.num-nodes", properties))); + setEmbedded(Boolean.valueOf(loadProperty("rhq.storage.cluster.is-embedded", properties))); - setNumTokens(Integer.valueOf(loadProperty("rhq.cassandra.num-tokens", properties))); - setNativeTransportPort(Integer.valueOf(loadProperty("rhq.cassandra.native-transport-port", properties))); - setRpcPort(Integer.valueOf(loadProperty("rhq.cassandra.rpc-port", properties))); - setNativeTransportMaxThreads(Integer.valueOf(loadProperty("rhq.cassandra.native-transport-max-threads", + setLoggingLevel(loadProperty("rhq.storage.logging.level", properties)); + setLogFileName(loadProperty("rhq.storage.log.file", properties)); + + setRpcPort(Integer.valueOf(loadProperty("rhq.storage.rpc-port", properties))); + setCqlPort(Integer.valueOf(loadProperty("rhq.storage.cql-port", properties))); + setJmxPort(Integer.valueOf(loadProperty("rhq.storage.jmx-port", properties))); + setGossipPort(Integer.valueOf(loadProperty("rhq.storage.gossip-port", properties))); + + setNumTokens(Integer.valueOf(loadProperty("rhq.storage.num-tokens", properties))); + setNativeTransportMaxThreads(Integer.valueOf(loadProperty("rhq.storage.native-transport-max-threads", properties))); - setAuthenticator(loadProperty("rhq.cassandra.authenticator", properties)); - setAuthorizer(loadProperty("rhq.cassandra.authorizer", properties)); - setDataDir(loadProperty("rhq.cassandra.data.dir", properties)); - setCommitLogDir(loadProperty("rhq.cassandra.commitlog.dir", properties)); - setSavedCachesDir(loadProperty("rhq.cassandra.saved.caches.dir", properties)); - setLogFileName(loadProperty("rhq.cassandra.log.file", properties)); - setListenAddress(loadProperty("rhq.cassandra.listen.address", properties)); - setStartRpc(Boolean.valueOf(loadProperty("rhq.cassandra.start_rpc", properties))); - setRpcAddress(loadProperty("rhq.cassandra.rpc.address", properties)); - setJmxPort(Integer.valueOf(loadProperty("rhq.cassandra.jmx.port", properties))); - setStoragePort(Integer.valueOf(loadProperty("rhq.cassandra.storage.port", properties))); - setSslStoragePort(Integer.valueOf(loadProperty("rhq.cassandra.ssl.storage.port", properties))); - - setSeeds(loadProperty("rhq.cassandra.seeds", properties)); - setBasedir(loadProperty("rhq.cassandra.basedir", properties)); - setHeapSize(loadProperty("rhq.cassandra.max.heap.size", properties)); - setHeapNewSize(loadProperty("rhq.cassandra.heap.new.size", properties)); - setStackSize(loadProperty("rhq.cassandra.stack.size", properties)); + + setAuthenticator(loadProperty("rhq.storage.authenticator", properties)); + setAuthorizer(loadProperty("rhq.storage.authorizer", properties)); + + setDataDir(loadProperty("rhq.storage.data", properties)); + setCommitLogDir(loadProperty("rhq.storage.commitlog", properties)); + setSavedCachesDir(loadProperty("rhq.storage.saved-caches", properties)); + + setSeeds(loadProperty("rhq.storage.seeds", properties)); + setListenAddress(loadProperty("rhq.storage.listen.address", properties)); + setStartRpc(Boolean.valueOf(loadProperty("rhq.storage.start_rpc", properties))); + setRpcAddress(loadProperty("rhq.storage.rpc.address", properties)); + + setHeapSize(loadProperty("rhq.storage.heap-size", properties)); + setHeapNewSize(loadProperty("rhq.storage.heap-new-size", properties)); + setStackSize(loadProperty("rhq.storage.stack-size", properties)); } private String loadProperty(String key, Properties properties) { @@ -182,7 +185,7 @@ public class DeploymentOptions { setEmbedded(other.embedded); setLoggingLevel(other.loggingLevel); setNumTokens(other.numTokens); - setNativeTransportPort(other.nativeTransportPort); + setCqlPort(cqlPort); setNativeTransportMaxThreads(other.nativeTransportMaxThreads); setUsername(other.username); setPassword(other.password); @@ -197,8 +200,7 @@ public class DeploymentOptions { setStartRpc(other.startRpc); setRpcPort(other.rpcPort); setJmxPort(other.jmxPort); - setStoragePort(other.storagePort); - setSslStoragePort(other.sslStoragePort); + setGossipPort(other.gossipPort); setSeeds(other.seeds); setBasedir(other.basedir); setHeapSize(other.heapSize); @@ -252,7 +254,7 @@ public class DeploymentOptions { /** * @return The directory in which the node will be installed. */ - @DeploymentProperty(name = "rhq.cassandra.basedir") + @DeploymentProperty(name = "rhq.storage.basedir") public String getBasedir() { return basedir; } @@ -269,7 +271,7 @@ public class DeploymentOptions { /** * @return The number of nodes in the cluster. This only applies to embedded clusters. */ - @DeploymentProperty(name = "rhq.cassandra.cluster.num-nodes") + @DeploymentProperty(name = "rhq.storage.cluster.num-nodes") public int getNumNodes() { return numNodes; } @@ -289,7 +291,7 @@ public class DeploymentOptions { * embedded cluster is one in which all nodes run on a single host and can only accept * requests from that same host. */ - @DeploymentProperty(name = "rhq.cassandra.cluster.is-embedded") + @DeploymentProperty(name = "rhq.storage.cluster.is-embedded") public boolean isEmbedded() { return embedded; } @@ -308,7 +310,7 @@ public class DeploymentOptions { /** * @return The log4j logging level that Cassandra uses */ - @DeploymentProperty(name = "rhq.cassandra.logging.level") + @DeploymentProperty(name = "rhq.storage.logging.level") public String getLoggingLevel() { return loggingLevel; } @@ -325,7 +327,7 @@ public class DeploymentOptions { /** * @return The number of tokens assigned to this the node on the ring. Defaults to 256. */ - @DeploymentProperty(name = "rhq.cassandra.num_tokens") + @DeploymentProperty(name = "rhq.storage.num_tokens") public Integer getNumTokens() { return numTokens; } @@ -343,24 +345,24 @@ public class DeploymentOptions { /** * @return The port on which Cassandra listens for client requests. */ - @DeploymentProperty(name = "rhq.cassandra.native_transport_port") - public Integer getNativeTransportPort() { - return nativeTransportPort; + @DeploymentProperty(name = "rhq.storage.cql-port") + public Integer getCqlPort() { + return cqlPort; } /** * @param port The port on which Cassandra listens for client requests. */ - public void setNativeTransportPort(Integer port) { - if (nativeTransportPort == null) { - nativeTransportPort = port; + public void setCqlPort(Integer port) { + if (cqlPort == null) { + cqlPort = port; } } /** * @return true whether the Thrift-based RPC should be started */ - @DeploymentProperty(name = "rhq.cassandra.start_rpc") + @DeploymentProperty(name = "rhq.storage.start_rpc") public Boolean getStartRpc() { return startRpc; } @@ -374,7 +376,7 @@ public class DeploymentOptions { } } - @DeploymentProperty(name = "rhq.cassandra.rpc_port") + @DeploymentProperty(name = "rhq.storage.rpc_port") public Integer getRpcPort() { return rpcPort; } @@ -388,7 +390,7 @@ public class DeploymentOptions { /** * @return The max number of threads to handle CQL requests */ - @DeploymentProperty(name = "rhq.cassandra.native_transport_max_threads") + @DeploymentProperty(name = "rhq.storage.native_transport_max_threads") public Integer getNativeTransportMaxThreads() { return nativeTransportMaxThreads; } @@ -449,7 +451,7 @@ public class DeploymentOptions { /** * @return The FQCN of the class that handles Cassandra authentication */ - @DeploymentProperty(name = "rhq.cassandra.authenticator") + @DeploymentProperty(name = "rhq.storage.authenticator") public String getAuthenticator() { return authenticator; } @@ -466,7 +468,7 @@ public class DeploymentOptions { /** * @return The FQCN of the class that handles Cassandra authorization */ - @DeploymentProperty(name = "rhq.cassandra.authorizer") + @DeploymentProperty(name = "rhq.storage.authorizer") public String getAuthorizer() { return authorizer; } @@ -483,7 +485,7 @@ public class DeploymentOptions { /** * @return The directory where Cassandra stores data on disk */ - @DeploymentProperty(name = "rhq.cassandra.data.dir") + @DeploymentProperty(name = "rhq.storage.data") public String getDataDir() { return dataDir; } @@ -500,7 +502,7 @@ public class DeploymentOptions { /** * @return The directory where Cassandra stores commit log files */ - @DeploymentProperty(name = "rhq.cassandra.commitlog.dir") + @DeploymentProperty(name = "rhq.storage.commitlog") public String getCommitLogDir() { return commitLogDir; } @@ -517,7 +519,7 @@ public class DeploymentOptions { /** * @return The directory where Cassandra stores saved caches on disk */ - @DeploymentProperty(name = "rhq.cassandra.saved.caches.dir") + @DeploymentProperty(name = "rhq.storage.saved-caches") public String getSavedCachesDir() { return savedCachesDir; } @@ -534,7 +536,7 @@ public class DeploymentOptions { /** * @return The full path of the Log4J log file to which Cassandra writes. */ - @DeploymentProperty(name = "rhq.cassandra.log.file") + @DeploymentProperty(name = "rhq.storage.log.file") public String getLogFileName() { return logFileName; } @@ -551,7 +553,7 @@ public class DeploymentOptions { /** * @return The address to which Cassandra binds and tells other node to connect to */ - @DeploymentProperty(name = "rhq.cassandra.listen.address") + @DeploymentProperty(name = "rhq.storage.listen.address") public String getListenAddress() { return listenAddress; } @@ -579,7 +581,7 @@ public class DeploymentOptions { /** * @return The port on which Cassandra listens for JMX connections */ - @DeploymentProperty(name = "rhq.cassandra.jmx.port") + @DeploymentProperty(name = "rhq.storage.jmx-port") public Integer getJmxPort() { return jmxPort; } @@ -596,36 +598,17 @@ public class DeploymentOptions { /** * @return The port on which Cassandra listens for gossip requests */ - @DeploymentProperty(name = "rhq.cassandra.storage.port") - public Integer getStoragePort() { - return storagePort; + @DeploymentProperty(name = "rhq.storage.gossip-port") + public Integer getGossipPort() { + return gossipPort; } /** * @param port The port on which Cassandra listens for gossip requests */ - public void setStoragePort(Integer port) { - if (storagePort == null) { - storagePort = port; - } - } - - /** - * @return The port on which Cassandra listens for encrypted gossip requests. Note that - * this is only used if encryption is enabled. - */ - @DeploymentProperty(name = "rhq.cassandra.ssl.storage.port") - public Integer getSslStoragePort() { - return sslStoragePort; - } - - /** - * @param port The port on which Cassandra listens for encrypted gossip requests. Note - * that this is only used if encryption is enabled. - */ - public void setSslStoragePort(Integer port) { - if (sslStoragePort == null) { - sslStoragePort = port; + public void setGossipPort(Integer port) { + if (gossipPort == null) { + gossipPort = port; } } @@ -633,7 +616,7 @@ public class DeploymentOptions { * @return A comma-delimited list of IP addresses/host names that are deemed contact * points during node start up to learn about the ring topology. */ - @DeploymentProperty(name = "rhq.cassandra.seeds") + @DeploymentProperty(name = "rhq.storage.seeds") public String getSeeds() { return seeds; } @@ -652,7 +635,7 @@ public class DeploymentOptions { * @return The value to use for both the max and min heap sizes. Defaults to * ${MAX_HEAP_SIZE} which allows the cassandra-env.sh script to determine the value. */ - @DeploymentProperty(name = "rhq.cassandra.max.heap.size") + @DeploymentProperty(name = "rhq.storage.heap-size") public String getHeapSize() { return heapSize; } @@ -671,7 +654,7 @@ public class DeploymentOptions { * @return The value to use for the size of the new generation. Defaults to * ${HEAP_NEWSIZE} which allows the cassandra-env.sh script to determine the value. */ - @DeploymentProperty(name = "rhq.cassandra.heap.new.size") + @DeploymentProperty(name = "rhq.storage.heap-new-size") public String getHeapNewSize() { return heapNewSize; } @@ -691,7 +674,7 @@ public class DeploymentOptions { * @return The value to use for the JVM stack size. This is passed directly to the -Xss * JVM start up option. */ - @DeploymentProperty(name = "rhq.cassandra.stack.size") + @DeploymentProperty(name = "rhq.storage.stack-size") public String getStackSize() { return stackSize; } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java index 7a3f207..5aa138c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java @@ -39,7 +39,7 @@ public class DeploymentOptionsFactory { */ public DeploymentOptions newDeploymentOptions() { // Make sure we have a high enough stack size. See https://bugzilla.redhat.com/show_bug.cgi?id=1008090 - System.setProperty("rhq.cassandra.stack.size", "256k"); + System.setProperty("rhq.storage.stack-size", "256k"); return new DeploymentOptions(); } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties index e44b3ac..3f565c1 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties @@ -4,7 +4,7 @@ # The directory in which Cassandra is installed. This property must be # specified. -rhq.cassandra.basedir=${rhq.rootDir} +rhq.storage.basedir=${rhq.rootDir} # The username with which to authenticate requests to Cassandra. # rhq.storage.username= @@ -18,77 +18,73 @@ rhq.cassandra.basedir=${rhq.rootDir} # hardware capability. Tokens are randomly generated with the expectation of an even # distribution. With that said, there can be some variation. Either increasing this value # or increasing the number of nodes in the cluster will help even out the distribution. -rhq.cassandra.num-tokens=256 +rhq.storage.num-tokens=256 # A comma-delimited list of IP addresses/host names that are deemed contact points. # Cassandra nodes use this list of hosts to find each other and learn the # topology of the ring. If you are running a local development cluster, be sure # to have aliases set up for localhost. -rhq.cassandra.seeds=localhost +rhq.storage.seeds=localhost # A class that performs authentication. The value should be a fully qualified class name # and implement IAuthenticator. -rhq.cassandra.authenticator=org.apache.cassandra.auth.PasswordAuthenticator +rhq.storage.authenticator=org.apache.cassandra.auth.PasswordAuthenticator # A class that performs authorization. Used to limit/provide permissions. The value should # be a fully qualified class name and implement IAuthorizer. -rhq.cassandra.authorizer=org.apache.cassandra.auth.CassandraAuthorizer +rhq.storage.authorizer=org.apache.cassandra.auth.CassandraAuthorizer # The IP address or hostname that other Cassandra nodes will use to connect to # this node. -rhq.cassandra.listen.address=localhost +rhq.storage.listen.address=localhost # Set this property to true for starting the Thrift-based RPC -rhq.cassandra.start_rpc=false +rhq.storage.start_rpc=false # The listen address for Thrift clients. -rhq.cassandra.rpc.address=localhost +rhq.storage.rpc.address=localhost # The port to listen for Thrift clients on. -rhq.cassandra.rpc-port=9160 +rhq.storage.rpc-port=9160 # The maximum number of threads handling native CQL requests. -rhq.cassandra.native-transport-max-threads=64 +rhq.storage.native-transport-max-threads=64 # The port for the CQL native transport to listen for clients on. -rhq.cassandra.native-transport-port=9042 +rhq.storage.cql-port=9042 # The port over which Cassandra listens for JMX connections. -rhq.cassandra.jmx.port=7200 +rhq.storage.jmx-port=7200 # TCP port, for commands and data (i.e., inter-node communication) -rhq.cassandra.storage.port=7000 - -# SSL port, for encrypted communication. Unused unless enabled in -# encryption_options (i.e., encrypted inter-node communication) -rhq.cassandra.ssl.storage.port=7001 +rhq.storage.gossip-port=7000 # The directory where Cassandra stores data files. -rhq.cassandra.data.dir=${rhq.cassandra.basedir}/data +rhq.storage.data=${rhq.storage.basedir}/data # Th directory where Cassandra stores commit log files. -rhq.cassandra.commitlog.dir=${rhq.cassandra.basedir}/commit_log +rhq.storage.commitlog=${rhq.storage.basedir}/commit_log # The directory where Cassandra stores saved caches. -rhq.cassandra.saved.caches.dir=${rhq.cassandra.basedir}/saved_caches +rhq.storage.saved-caches=${rhq.storage.basedir}/saved_caches # The directory where Cassandra stored log4j log files. -rhq.cassandra.log.dir=${rhq.cassandra.basedir}/logs +rhq.storage.log.dir=${rhq.storage.basedir}/logs # The log file to which Cassandra writes. -rhq.cassandra.log.file=${rhq.cassandra.basedir}/logs/rhq-storage-node.log +rhq.storage.log.file=${rhq.storage.basedir}/logs/rhq-storage-node.log # Used for both the min and max heap sizes for the Cassandra JVM. -rhq.cassandra.max.heap.size=\${MAX_HEAP_SIZE} +rhq.storage.heap-size=\${MAX_HEAP_SIZE} # Heap new size refers to the size of the young generation. -rhq.cassandra.heap.new.size=\${HEAP_NEWSIZE} +rhq.storage.heap-new-size=\${HEAP_NEWSIZE} # The JVM stack size for Cassandra. This value is passed directly to the -Xss option. -rhq.cassandra.stack.size=256k +rhq.storage.stack-size=256k # The log4j logging level to use. -rhq.cassandra.logging.level=DEBUG +rhq.storage.logging.level=DEBUG # The remaining properties pertain to cluster configuration and are only used in # development and testing environments when an embedded cluster is used. These properties @@ -102,16 +98,16 @@ rhq.cassandra.logging.level=DEBUG # Accepts a value of true or false and specifies whether or not the cluster is embedded. # Note that if this property is set to false, the other, remaining cluster configuration # properties that are set will be ignored as they are only used with embedded clusters. -rhq.cassandra.cluster.is-embedded=true +rhq.storage.cluster.is-embedded=true ################################################################### # Properties below this point apply ONLY to embedded clusters. # ################################################################### # The directory in which cluster nodes will be installed. -rhq.cassandra.cluster.dir=${rhq.rootDir}/cassandra +rhq.storage.cluster.dir=${rhq.rootDir}/cassandra # The number of nodes in the cluster. This specifies how many nodes to install and # configure. The top level or base directory for each node will be nodeN where N is the # node number. -rhq.cassandra.cluster.num-nodes=2 +rhq.storage.cluster.num-nodes=2 diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java index 76ff090..86c382d 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/java/org/rhq/cassandra/DeployerITest.java @@ -33,15 +33,15 @@ import java.io.File; import java.io.FileReader; import java.util.List; +import difflib.DiffUtils; +import difflib.Patch; + import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.rhq.core.util.StringUtil; import org.rhq.core.util.stream.StreamUtil; -import difflib.DiffUtils; -import difflib.Patch; - /** * @author John Sanda */ @@ -81,7 +81,7 @@ public class DeployerITest { assertTrue(binDir.exists(), binDir + " does not exist"); File confDir = new File(deployDir, "conf"); - assertTrue(confDir.exists(), confDir + " does not exist"); + assertTrue(confDir.exists(), confDir + " does not exist"); File libDir = new File(deployDir, "lib"); assertTrue(libDir.exists(), libDir + " does not exist"); @@ -89,7 +89,14 @@ public class DeployerITest { @Test(dependsOnMethods = "deploy") public void applyConfigChanges() throws Exception { - deployer.applyConfigChanges(); + try { + deployer.applyConfigChanges(); + } catch (DeploymentException e) { + // on windows the update will fail when looking for the wrapper file + if (!(File.separatorChar == '\\' && e.getMessage().contains("rhq-storage-wrapper.env"))) { + throw e; + } + } } @Test(dependsOnMethods = "applyConfigChanges") @@ -110,15 +117,15 @@ public class DeployerITest { private void assertFileDeployedAndUpdated(String fileName) throws Exception { File rhqFile = new File(confDir, "rhq." + fileName); File file = new File(confDir, fileName); - assertTrue(file.exists(), file + " does not exist"); + assertTrue(file.exists(), file + " does not exist"); assertFalse(rhqFile.exists(), "Failed to delete " + rhqFile); assertFileUpdated(file); } private void assertFileUpdated(File actualFile) throws Exception { File expectedFile = new File(getClass().getResource("/expected." + actualFile.getName()).toURI()); - assertTrue(expectedFile.exists(), "Cannot verify that " + actualFile.getName() + " has been updated. There " + - "should be a file named expected." + actualFile.getName() + " in the root of the test classpath."); + assertTrue(expectedFile.exists(), "Cannot verify that " + actualFile.getName() + " has been updated. There " + + "should be a file named expected." + actualFile.getName() + " in the root of the test classpath."); String actualContents = StreamUtil.slurp(new FileReader(actualFile)); List<String> actualList = asList(actualContents.split("\\n")); @@ -127,10 +134,10 @@ public class DeployerITest { List<String> expectedList = asList(expectedContents.split("\\n")); Patch patch = DiffUtils.diff(actualList, expectedList); - List<String> diffs = DiffUtils.generateUnifiedDiff(actualFile.getName(), "expected.cassandra.yaml", - actualList, patch, 5); - assertTrue(patch.getDeltas().isEmpty(), actualFile.getName() + " was not configured correctly. The " + - "following differences were found:\n" + StringUtil.listToString(diffs, "\n")); + List<String> diffs = DiffUtils.generateUnifiedDiff(actualFile.getName(), "expected.cassandra.yaml", actualList, + patch, 5); + assertTrue(patch.getDeltas().isEmpty(), actualFile.getName() + " was not configured correctly. The " + + "following differences were found:\n" + StringUtil.listToString(diffs, "\n")); } } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml index 1aa6f87..90f298e 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra.yaml @@ -311,7 +311,7 @@ storage_port: 7000 # SSL port, for encrypted communication. Unused unless enabled in # encryption_options -ssl_storage_port: 7001 +ssl_storage_port: 7101 # Address to bind to and tell other Cassandra nodes to connect to. You # _must_ change this if you want multiple nodes to be able to diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java index ab58c95..286a5ff 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/src/main/java/org/rhq/cassandra/CCMTestNGListener.java @@ -56,8 +56,8 @@ public class CCMTestNGListener implements IInvokedMethodListener { Method method = invokedMethod.getTestMethod().getConstructorOrMethod().getMethod(); if (method.isAnnotationPresent(ShutdownCluster.class)) { try { - Boolean skipShutdown = Boolean.valueOf( - System.getProperty("rhq.cassandra.cluster.skip-shutdown", "false")); + Boolean skipShutdown = Boolean + .valueOf(System.getProperty("rhq.storage.cluster.skip-shutdown", "false")); if (!skipShutdown) { shutdownCluster(); } @@ -68,12 +68,12 @@ public class CCMTestNGListener implements IInvokedMethodListener { } private void deployCluster(DeployCluster annotation) throws Exception { - boolean deploy = Boolean.valueOf(System.getProperty("rhq.cassandra.cluster.deploy", "true")); + boolean deploy = Boolean.valueOf(System.getProperty("rhq.storage.cluster.deploy", "true")); if (!deploy) { return; } - String clusterDir = System.getProperty("rhq.cassandra.cluster.dir"); + String clusterDir = System.getProperty("rhq.storage.cluster.dir"); if (clusterDir == null || clusterDir.isEmpty()) { File basedir = new File("target"); clusterDir = new File(basedir, "cassandra").getAbsolutePath(); @@ -102,7 +102,7 @@ public class CCMTestNGListener implements IInvokedMethodListener { String[] nodes = ccm.getNodes(); int[] jmxPorts = ccm.getJmxPorts(); - if (System.getProperty("rhq.cassandra.cluster.skip-shutdown") == null) { + if (System.getProperty("rhq.storage.cluster.skip-shutdown") == null) { for (int index = 0; index < nodes.length; index++) { try { if (clusterInitService.isNativeTransportRunning(nodes[index], jmxPorts[index])) { @@ -115,7 +115,6 @@ public class CCMTestNGListener implements IInvokedMethodListener { } ccm.startCluster(false); - clusterInitService.waitForClusterToStart(nodes, jmxPorts, nodes.length, 2000, 20, 10); SchemaManager schemaManager = new SchemaManager(annotation.username(), annotation.password(), nodes, diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java index 295c7ed..58c04ac 100644 --- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java +++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java @@ -105,9 +105,20 @@ public class StorageInstaller { private final String STORAGE_BASEDIR = "rhq-storage"; - private final Log log = LogFactory.getLog(StorageInstaller.class); + private static final String OPTION_HOSTNAME = "rhq.storage.hostname"; + private static final String OPTION_SEEDS = "rhq.storage.seeds"; + private static final String OPTION_CQL_PORT = "rhq.storage.cql-port"; + private static final String OPTION_JMX_PORT = "rhq.storage.jmx-port"; + private static final String OPTION_GOSSIP_PORT = "rhq.storage.gossip-port"; + private static final String OPTION_COMMITLOG = "rhq.storage.commitlog"; + private static final String OPTION_DATA = "rhq.storage.data"; + private static final String OPTION_SAVED_CACHES = "rhq.storage.saved-caches"; + private static final String OPTION_HEAP_SIZE = "rhq.storage.heap-size"; + private static final String OPTION_HEAP_NEW_SIZE = "rhq.storage.heap-new-size"; + private static final String OPTION_STACK_SIZE = "rhq.storage.stack-size"; + private static final String OPTION_VERIFY_DATA_DIRS_EMPTY = "rhq.storage.verify-data-dirs-empty"; - private final String VERIFY_DATA_DIRS_EMPTY = "verify-data-dirs-empty"; + private final Log log = LogFactory.getLog(StorageInstaller.class); private Options options; @@ -119,11 +130,9 @@ public class StorageInstaller { private int rpcPort = 9160; - private int defaultNativeTransportPort = 9142; - - private int defaultStoragePort = 7100; + private int defaultCqlPort = 9142; - private int sslStoragePort = 7101; + private int defaultGossipPort = 7100; private File logDir; @@ -137,28 +146,28 @@ public class StorageInstaller { storageBasedir = new File(basedir, STORAGE_BASEDIR); logDir = new File(serverBasedir, "logs"); - Option hostname = new Option("n", "hostname", true, + Option hostname = new Option("n", OPTION_HOSTNAME, true, "The hostname or IP address on which the node will listen for " - + "requests. Note that if a hostname is specified, the IP address is used. Defaults to the IP " + - "address of the local host (which depending on hostname configuration may not be localhost)."); + + "requests. Note that if a hostname is specified, the IP address is used. Defaults to the IP " + + "address of the local host (which depending on hostname configuration may not be localhost)."); hostname.setArgName("HOSTNAME"); - Option seeds = new Option("s", "seeds", true, "A comma-delimited list of hostnames or IP addresses that " + Option seeds = new Option("s", OPTION_SEEDS, true, "A comma-delimited list of hostnames or IP addresses that " + "serve as contact points. Nodes use this list to find each other and to learn the cluster topology. " + "It does not need to specify all nodes in the cluster. Defaults to this node's hostname."); seeds.setArgName("SEEDS"); - Option jmxPortOption = new Option("j", "jmx-port", true, "The port on which to listen for JMX connections. " - + "Defaults to " + defaultJmxPort + "."); + Option jmxPortOption = new Option("j", OPTION_JMX_PORT, true, + "The port on which to listen for JMX connections. " + "Defaults to " + defaultJmxPort + "."); jmxPortOption.setArgName("PORT"); - Option nativeTransportPortOption = new Option("c", "client-port", true, "The port on which to " - + "listen for client requests. Defaults to " + defaultNativeTransportPort); - nativeTransportPortOption.setArgName("PORT"); + Option cqlPortOption = new Option("c", OPTION_CQL_PORT, true, "The port on which to " + + "listen for client requests. Defaults to " + defaultCqlPort); + cqlPortOption.setArgName("PORT"); - Option storagePortOption = new Option(null, "storage-port", true, "The port on which to listen for requests " - + " from other nodes. Defaults to " + defaultStoragePort); - storagePortOption.setArgName("PORT"); + Option gossipPortOption = new Option(null, OPTION_GOSSIP_PORT, true, + "The port on which to listen for requests " + " from other nodes. Defaults to " + defaultGossipPort); + gossipPortOption.setArgName("PORT"); Option startOption = new Option(null, "start", true, "Start the storage node after installing it on disk. " + "Defaults to true."); @@ -168,45 +177,49 @@ public class StorageInstaller { + "after starting it. This option is ignored if the start option is not set. Defaults to true."); checkStatus.setArgName("true|false"); - Option commitLogOption = new Option(null, "commitlog", true, "The directory where the storage node keeps " + Option commitLogOption = new Option(null, OPTION_COMMITLOG, true, "The directory where the storage node keeps " + "commit log files. Defaults to " + getDefaultCommitLogDir() + "."); commitLogOption.setArgName("DIR"); - Option dataDirOption = new Option(null, "data", true, "The directory where the storage node keeps data files. " - + "Defaults to " + getDefaultDataDir() + "."); + Option dataDirOption = new Option(null, OPTION_DATA, true, + "The directory where the storage node keeps data files. " + "Defaults to " + getDefaultDataDir() + "."); dataDirOption.setArgName("DIR"); - Option savedCachesDirOption = new Option(null, "saved-caches", true, "The directory where the storage node " - + "keeps saved cache files. Defaults to " + getDefaultSavedCachesDir() + "."); + Option savedCachesDirOption = new Option(null, OPTION_SAVED_CACHES, true, + "The directory where the storage node " + "keeps saved cache files. Defaults to " + + getDefaultSavedCachesDir() + "."); savedCachesDirOption.setArgName("DIR"); Option basedirOption = new Option(null, "dir", true, "The directory where the storage node will be installed " + "The default directory will be " + storageBasedir); - Option heapSizeOption = new Option(null, "heap-size", true, "The value to use for both the min and max heap. " - + "This value is passed directly to the -Xms and -Xmx options of the Java executable. Defaults to " - + defaultHeapSize); + Option heapSizeOption = new Option(null, OPTION_HEAP_SIZE, true, + "The value to use for both the min and max heap. " + + "This value is passed directly to the -Xms and -Xmx options of the Java executable. Defaults to " + + defaultHeapSize); - Option heapNewSizeOption = new Option(null, "heap-new-size", true, "The value to use for the new generation " - + "of the heap. This value is passed directly to the -Xmn option of the Java executable. Defaults to " - + defaultHeapNewSize); + Option heapNewSizeOption = new Option(null, OPTION_HEAP_NEW_SIZE, true, + "The value to use for the new generation " + + "of the heap. This value is passed directly to the -Xmn option of the Java executable. Defaults to " + + defaultHeapNewSize); - Option stackSizeOption = new Option(null, "stack-size", true, "The value to use for the thread stack size. " - + "This value is passed directly to the -Xss option of the Java executable."); + Option stackSizeOption = new Option(null, OPTION_STACK_SIZE, true, + "The value to use for the thread stack size. " + + "This value is passed directly to the -Xss option of the Java executable."); Option upgradeOption = new Option(null, "upgrade", true, "Upgrades an existing storage node. The directory " + "where the existing RHQ server is installed."); upgradeOption.setArgName("RHQ_SERVER_DIR"); - Option verifyDataDirsEmptyOption = new Option(null, VERIFY_DATA_DIRS_EMPTY, true, "Will cause the installer " + - "to abort if any of the data directories is not empty. Defaults to true."); + Option verifyDataDirsEmptyOption = new Option(null, OPTION_VERIFY_DATA_DIRS_EMPTY, true, + "Will cause the installer " + "to abort if any of the data directories is not empty. Defaults to true."); options = new Options().addOption(new Option("h", "help", false, "Show this message.")).addOption(hostname) .addOption(seeds).addOption(jmxPortOption).addOption(startOption).addOption(checkStatus) .addOption(commitLogOption).addOption(dataDirOption).addOption(savedCachesDirOption) - .addOption(nativeTransportPortOption).addOption(storagePortOption).addOption(basedirOption) - .addOption(heapSizeOption).addOption(heapNewSizeOption).addOption(stackSizeOption) - .addOption(upgradeOption).addOption(verifyDataDirsEmptyOption); + .addOption(cqlPortOption).addOption(gossipPortOption).addOption(basedirOption).addOption(heapSizeOption) + .addOption(heapNewSizeOption).addOption(stackSizeOption).addOption(upgradeOption) + .addOption(verifyDataDirsEmptyOption); } public int run(CommandLine cmdLine) throws Exception { @@ -230,14 +243,14 @@ public class StorageInstaller { log.warn(e.getMessage()); log.warn("The storage installer will exit due to previous errors"); return e.getErrorCode(); - } + } PropertiesFileUpdate serverPropertiesUpdater = getServerProperties(); log.info("Updating rhq-server.properties..."); Properties properties = new Properties(); properties.setProperty("rhq.storage.nodes", installerInfo.hostname); - properties.setProperty("rhq.storage.cql-port", Integer.toString(installerInfo.cqlPort)); - properties.setProperty("rhq.storage.gossip-port", Integer.toString(installerInfo.gossipPort)); + properties.setProperty(OPTION_CQL_PORT, Integer.toString(installerInfo.cqlPort)); + properties.setProperty(OPTION_GOSSIP_PORT, Integer.toString(installerInfo.gossipPort)); serverPropertiesUpdater.update(properties); @@ -257,12 +270,12 @@ public class StorageInstaller { log.warn("The storage node reported the following errors while trying to start:\n\n" + startupErrors + "\n"); if (startupErrors.contains("Port already in use: " + installerInfo.jmxPort)) { - log.warn("There is a conflict with the JMX port that prevented the storage node JVM " + - "from starting."); + log.warn("There is a conflict with the JMX port that prevented the storage node JVM " + + "from starting."); File confDir = new File(storageBasedir, "conf"); File confFile = new File(confDir, "cassandra-jvm.properties"); - log.info("Change the jmx_port property in " + confFile + " to have the storage node listen " + - "on a different port for JMX connections."); + log.info("Change the jmx_port property in " + confFile + " to have the storage node listen " + + "on a different port for JMX connections."); return STATUS_JMX_PORT_CONFLICT; } @@ -283,13 +296,12 @@ public class StorageInstaller { } } else { if (isRunning()) { - log.info("Installation of the storage node is complete. The node should be up and " - + "running"); + log.info("Installation of the storage node is complete. The node should be up and " + "running"); return STATUS_NO_ERRORS; } else { log.warn("Installation of the storage node is complete, but the node does not appear to " - + "be running. No start up errors were reported. Check the log file at " + - installerInfo.logFile + " for any other possible errors."); + + "be running. No start up errors were reported. Check the log file at " + + installerInfo.logFile + " for any other possible errors."); return STATUS_STORAGE_NOT_RUNNING; } } @@ -322,96 +334,91 @@ public class StorageInstaller { deploymentOptions.setListenAddress(installerInfo.hostname); deploymentOptions.setRpcAddress(installerInfo.hostname); - String seeds = cmdLine.getOptionValue("seeds", installerInfo.hostname); + String seeds = cmdLine.getOptionValue(OPTION_SEEDS, installerInfo.hostname); deploymentOptions.setSeeds(seeds); - String commitlogDir = cmdLine.getOptionValue("commitlog", getDefaultCommitLogDir().getAbsolutePath()); - String dataDir = cmdLine.getOptionValue("data", getDefaultDataDir().getAbsolutePath()); - String savedCachesDir = cmdLine.getOptionValue("saved-caches", getDefaultSavedCachesDir().getAbsolutePath()); + String commitlogDir = cmdLine.getOptionValue(OPTION_COMMITLOG, getDefaultCommitLogDir().getAbsolutePath()); + String dataDir = cmdLine.getOptionValue(OPTION_DATA, getDefaultDataDir().getAbsolutePath()); + String savedCachesDir = cmdLine.getOptionValue(OPTION_SAVED_CACHES, getDefaultSavedCachesDir() + .getAbsolutePath()); File commitLogDirFile = new File(commitlogDir); File dataDirFile = new File(dataDir); File savedCachesDirFile = new File(savedCachesDir); installerInfo.logFile = new File(logDir, "rhq-storage.log"); - boolean verifyDataDirsEmpty = Boolean.valueOf(cmdLine.getOptionValue(VERIFY_DATA_DIRS_EMPTY, "true")); + boolean verifyDataDirsEmpty = Boolean + .valueOf(cmdLine.getOptionValue(OPTION_VERIFY_DATA_DIRS_EMPTY, "true")); if (verifyDataDirsEmpty) { // validate the three data directories are empty - if they are not, we are probably stepping on // another storage node if (!isDirectoryEmpty(commitLogDirFile)) { log.error("Commitlog directory is not empty. It should not exist for a new Storage Node [" + commitLogDirFile.getAbsolutePath() + "]"); - throw new StorageInstallerException("Installation cannot proceed. The commit log directory " + - commitLogDirFile + " is not empty", STATUS_DATA_DIR_NOT_EMPTY); + throw new StorageInstallerException("Installation cannot proceed. The commit log directory " + + commitLogDirFile + " is not empty", STATUS_DATA_DIR_NOT_EMPTY); } if (!isDirectoryEmpty(dataDirFile)) { log.error("Data directory is not empty. It should not exist for a new Storage Node [" + dataDirFile.getAbsolutePath() + "]"); - throw new StorageInstallerException("Installation cannot proceed. The data directory " + dataDirFile + - " is not empty", STATUS_DATA_DIR_NOT_EMPTY); + throw new StorageInstallerException("Installation cannot proceed. The data directory " + + dataDirFile + " is not empty", STATUS_DATA_DIR_NOT_EMPTY); } if (!isDirectoryEmpty(savedCachesDirFile)) { log.error("Saved caches directory is not empty. It should not exist for a new Storage Node [" + savedCachesDirFile.getAbsolutePath() + "]"); - throw new StorageInstallerException("Installation cannot proceed. The saved caches directory " + - savedCachesDirFile + " is not empty", STATUS_DATA_DIR_NOT_EMPTY); + throw new StorageInstallerException("Installation cannot proceed. The saved caches directory " + + savedCachesDirFile + " is not empty", STATUS_DATA_DIR_NOT_EMPTY); } } - installerInfo.jmxPort = getPort(cmdLine, "jmx-port", defaultJmxPort); + installerInfo.jmxPort = getPort(cmdLine, OPTION_JMX_PORT, defaultJmxPort); if (isPortBound(installerInfo.hostname, installerInfo.jmxPort, "jmx-port")) { - throw new StorageInstallerException("The jmx-port (" + installerInfo.jmxPort + ") is already in use. " + - "Installation cannot proceed.", STATUS_JMX_PORT_CONFLICT); + throw new StorageInstallerException("The jmx-port (" + installerInfo.jmxPort + ") is already in use. " + + "Installation cannot proceed.", STATUS_JMX_PORT_CONFLICT); } - installerInfo.cqlPort = getPort(cmdLine, "client-port", defaultNativeTransportPort); - if (isPortBound(installerInfo.hostname, installerInfo.cqlPort, "client-port")) { - throw new StorageInstallerException("The client-port (" + installerInfo.cqlPort + ") is already in use. " + - "Installation cannot proceed.", STATUS_CQL_PORT_CONFLICT); + installerInfo.cqlPort = getPort(cmdLine, OPTION_CQL_PORT, defaultCqlPort); + if (isPortBound(installerInfo.hostname, installerInfo.cqlPort, OPTION_CQL_PORT)) { + throw new StorageInstallerException("The cql-port (" + installerInfo.cqlPort + ") is already in use. " + + "Installation cannot proceed.", STATUS_CQL_PORT_CONFLICT); } - installerInfo.gossipPort = getPort(cmdLine, "storage-port", defaultStoragePort); - if (isPortBound(installerInfo.hostname, installerInfo.gossipPort, "storage-port")) { - throw new StorageInstallerException("The storage-port (" + installerInfo.gossipPort + ") is already in use. " + - "Installation cannot proceed.", STATUS_GOSSIP_PORT_CONFLICT); + installerInfo.gossipPort = getPort(cmdLine, OPTION_GOSSIP_PORT, defaultGossipPort); + if (isPortBound(installerInfo.hostname, installerInfo.gossipPort, OPTION_GOSSIP_PORT)) { + throw new StorageInstallerException("The gossip-port (" + installerInfo.gossipPort + + ") is already in use. " + "Installation cannot proceed.", STATUS_GOSSIP_PORT_CONFLICT); } deploymentOptions.setCommitLogDir(commitlogDir); // TODO add support for specifying multiple dirs deploymentOptions.setDataDir(dataDirFile.getAbsolutePath()); deploymentOptions.setSavedCachesDir(savedCachesDir); + deploymentOptions.setLogFileName(installerInfo.logFile.getPath()); deploymentOptions.setLoggingLevel("INFO"); - deploymentOptions.setRpcPort(rpcPort); - deploymentOptions.setNativeTransportPort(installerInfo.cqlPort); - deploymentOptions.setStoragePort(installerInfo.gossipPort); - deploymentOptions.setSslStoragePort(getPort(cmdLine, "ssl-storage-port", sslStoragePort)); + deploymentOptions.setRpcPort(rpcPort); + deploymentOptions.setCqlPort(installerInfo.cqlPort); + deploymentOptions.setGossipPort(installerInfo.gossipPort); deploymentOptions.setJmxPort(installerInfo.jmxPort); - deploymentOptions.setHeapSize(cmdLine.getOptionValue("heap-size", defaultHeapSize)); - deploymentOptions.setHeapNewSize(cmdLine.getOptionValue("heap-new-size", defaultHeapNewSize)); - if (cmdLine.hasOption("stack-size")) { - deploymentOptions.setStackSize(cmdLine.getOptionValue("stack-size")); - } + deploymentOptions.setHeapSize(cmdLine.getOptionValue(OPTION_HEAP_SIZE, defaultHeapSize)); + deploymentOptions.setHeapNewSize(cmdLine.getOptionValue(OPTION_HEAP_NEW_SIZE, defaultHeapNewSize)); + if (cmdLine.hasOption(OPTION_STACK_SIZE)) { + deploymentOptions.setStackSize(cmdLine.getOptionValue(OPTION_STACK_SIZE)); + } // The out of box default for native_transport_max_threads is 128. We default // to 64 for dev/test environments so we need to update it here. deploymentOptions.setNativeTransportMaxThreads(128); - deploymentOptions.setHeapSize(cmdLine.getOptionValue("heap-size", defaultHeapSize)); - deploymentOptions.setHeapNewSize(cmdLine.getOptionValue("heap-new-size", defaultHeapNewSize)); - - if (cmdLine.hasOption("stack-size")) { - deploymentOptions.setStackSize(cmdLine.getOptionValue("stack-size")); - } - deploymentOptions.load(); List<String> errors = new ArrayList<String>(); - checkPerms(options.getOption("saved-caches"), savedCachesDir, errors); - checkPerms(options.getOption("commitlog"), commitlogDir, errors); - checkPerms(options.getOption("data"), dataDir, errors); + checkPerms(options.getOption(OPTION_SAVED_CACHES), savedCachesDir, errors); + checkPerms(options.getOption(OPTION_COMMITLOG), commitlogDir, errors); + checkPerms(options.getOption(OPTION_DATA), dataDir, errors); if (!errors.isEmpty()) { log.error("Problems have been detected with one or more of the directories in which the storage " @@ -419,11 +426,12 @@ public class StorageInstaller { for (String error : errors) { log.error(error); } - throw new StorageInstallerException("Installation cannot proceed. There are problems with one or more of " + - "the storage data directories.", STATUS_INVALID_FILE_PERMISSIONS); + throw new StorageInstallerException( + "Installation cannot proceed. There are problems with one or more of " + + "the storage data directories.", STATUS_INVALID_FILE_PERMISSIONS); } - Deployer deployer = new Deployer(); + Deployer deployer = getDeployer(); deployer.setDeploymentOptions(deploymentOptions); storageBasedir.mkdirs(); deployer.unzipDistro(); @@ -439,11 +447,19 @@ public class StorageInstaller { throw new StorageInstallerException("The upgrade cannot proceed. An unexpected I/O error occurred", e, STATUS_IO_ERROR); } catch (DeploymentException e) { - throw new StorageInstallerException("The installation cannot proceed. An error occurred during storage " + - "node deployment.", e, STATUS_DEPLOYMENT_ERROR); + throw new StorageInstallerException("The installation cannot proceed. An error occurred during storage " + + "node deployment.", e, STATUS_DEPLOYMENT_ERROR); } } + /** + * This can be overridden to allow for custom deploy behavior. + * @return a Deployer + */ + protected Deployer getDeployer() { + return new Deployer(); + } + private InstallerInfo upgrade(File upgradeFromDir) throws StorageInstallerException { DeploymentOptionsFactory factory = new DeploymentOptionsFactory(); DeploymentOptions deploymentOptions = factory.newDeploymentOptions(); @@ -454,16 +470,16 @@ public class StorageInstaller { if (!upgradeFromDir.isDirectory()) { log.error("The value passed to the upgrade option is not a directory. The value must be a valid " + "path that points to the base directory of an existing RHQ server installation."); - throw new StorageInstallerException("The upgrade cannot proceed. The value passed to the upgrade option " + - "is invalid.", STATUS_INVALID_UPGRADE); + throw new StorageInstallerException("The upgrade cannot proceed. The value passed to the upgrade option " + + "is invalid.", STATUS_INVALID_UPGRADE); } existingStorageDir = new File(upgradeFromDir, "rhq-storage"); if (!(existingStorageDir.exists() && existingStorageDir.isDirectory())) { log.error(existingStorageDir + " does not appear to be an existing RHQ storage node installation. " + "Check the value that was passed to the upgrade option and make sure it specifies the base " + "directory of an existing RHQ server installation."); - throw new StorageInstallerException("The upgrade cannot proceed. " + existingStorageDir + " is not an " + - "existing RHQ storage node installation", STATUS_INVALID_UPGRADE); + throw new StorageInstallerException("The upgrade cannot proceed. " + existingStorageDir + " is not an " + + "existing RHQ storage node installation", STATUS_INVALID_UPGRADE); } try { @@ -540,8 +556,8 @@ public class StorageInstaller { return installerInfo; } catch (DeploymentException e) { - throw new StorageInstallerException("THe upgrade cannot proceed. An error occurred during the storage " + - "node deployment", e, STATUS_DEPLOYMENT_ERROR); + throw new StorageInstallerException("THe upgrade cannot proceed. An error occurred during the storage " + + "node deployment", e, STATUS_DEPLOYMENT_ERROR); } catch (IOException e) { throw new StorageInstallerException("The upgrade cannot proceed. An unexpected I/O error occurred", e, STATUS_IO_ERROR); @@ -852,7 +868,7 @@ public class StorageInstaller { throw new RuntimeException("Cannot determine JMX port"); } - jmxPort = jmxPort.replaceAll("\"",""); + jmxPort = jmxPort.replaceAll("\"", ""); return Integer.parseInt(jmxPort); } catch (IOException e) { @@ -895,8 +911,8 @@ public class StorageInstaller { public Options getHelpOptions() { Options helpOptions = new Options(); - for (Option option : (Collection<Option>)options.getOptions()) { - if (option.getLongOpt().equals(VERIFY_DATA_DIRS_EMPTY)) { + for (Option option : (Collection<Option>) options.getOptions()) { + if (option.getLongOpt().equals(OPTION_VERIFY_DATA_DIRS_EMPTY)) { continue; } helpOptions.addOption(option); diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index dff74bf..fab1a9f 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -1,6 +1,5 @@ package org.rhq.storage.installer; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -28,6 +27,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.rhq.cassandra.CassandraClusterManager; +import org.rhq.cassandra.Deployer; +import org.rhq.cassandra.DeploymentException; import org.rhq.cassandra.util.ConfigEditor; import org.rhq.core.util.MessageDigestGenerator; import org.rhq.core.util.file.FileUtil; @@ -68,7 +69,7 @@ public class StorageInstallerTest { storageDir = new File(serverDir, "rhq-storage"); - installer = new StorageInstaller(); + installer = new SafeStorageInstaller(); } @AfterMethod(alwaysRun = true) @@ -134,7 +135,7 @@ public class StorageInstallerTest { assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", "The authenticator property is wrong"); assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); - assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); @@ -154,7 +155,7 @@ public class StorageInstallerTest { CommandLineParser parser = new PosixParser(); File defaultInstallDir = new File(basedir.getParentFile(), "performDefaultInstall"); File upgradeFromServerDir = new File(defaultInstallDir, "rhq-server"); - String[] args = {"--upgrade", upgradeFromServerDir.getAbsolutePath()}; + String[] args = { "--upgrade", upgradeFromServerDir.getAbsolutePath() }; CommandLine cmdLine = parser.parse(installer.getOptions(), args); int status = installer.run(cmdLine); @@ -204,7 +205,7 @@ public class StorageInstallerTest { assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", "The authenticator property is wrong"); assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); - assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); @@ -221,7 +222,7 @@ public class StorageInstallerTest { @Test public void performValidInstallWithOutputToStderr() throws Exception { - installer = new StorageInstaller() { + installer = new SafeStorageInstaller() { @Override protected void exec(Executor executor, org.apache.commons.exec.CommandLine cmdLine) throws IOException { executor.execute(cmdLine, ImmutableMap.of("JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF8")); @@ -247,7 +248,8 @@ public class StorageInstallerTest { serverSocket.bind(new InetSocketAddress(address, 7799)); CommandLineParser parser = new PosixParser(); - CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {"--jmx-port", "7799"}); + CommandLine cmdLine = parser.parse(installer.getOptions(), + new String[] { "--rhq.storage.jmx-port", "7799" }); int status = installer.run(cmdLine); @@ -268,7 +270,8 @@ public class StorageInstallerTest { serverSocket.bind(new InetSocketAddress(address, 9342)); CommandLineParser parser = new PosixParser(); - CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {"--client-port", "9342"}); + CommandLine cmdLine = parser.parse(installer.getOptions(), + new String[] { "--rhq.storage.cql-port", "9342" }); int status = installer.run(cmdLine); @@ -284,15 +287,11 @@ public class StorageInstallerTest { public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser(); - String[] args = { - "--dir", storageDir.getAbsolutePath(), - "--commitlog", new File(storageDir, "commit_log").getAbsolutePath(), - "--data", new File(storageDir, "data").getAbsolutePath(), - "--saved-caches", new File(storageDir, "saved_caches").getAbsolutePath(), - "--heap-size", "256M", - "--heap-new-size", "64M", - "--hostname", "127.0.0.1" - }; + String[] args = { "--dir", storageDir.getAbsolutePath(), "--rhq.storage.commitlog", + new File(storageDir, "commit_log").getAbsolutePath(), "--rhq.storage.data", + new File(storageDir, "data").getAbsolutePath(), "--rhq.storage.saved-caches", + new File(storageDir, "saved_caches").getAbsolutePath(), "--rhq.storage.heap-size", "256M", + "--rhq.storage.heap-new-size", "64M", "--rhq.storage.hostname", "127.0.0.1" }; CommandLine cmdLine = parser.parse(installer.getOptions(), args); int status = installer.run(cmdLine); @@ -331,19 +330,16 @@ public class StorageInstallerTest { File oldLog4JFile = new File(rhq48StorageConfDir, "log4j-server.properties"); rhq48StorageConfDir.mkdirs(); - StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra.yaml"), - new FileOutputStream(oldCassandraYamlFile), true); - StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra-env.sh"), - new FileOutputStream(oldCassandraEnvFile)); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra.yaml"), new FileOutputStream( + oldCassandraYamlFile), true); + StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/cassandra-env.sh"), new FileOutputStream( + oldCassandraEnvFile)); StreamUtil.copy(getClass().getResourceAsStream("/rhq48/storage/conf/log4j-server.properties"), new FileOutputStream(oldLog4JFile)); CommandLineParser parser = new PosixParser(); - String[] args = { - "--upgrade", rhq48ServerDir.getAbsolutePath(), - "--dir", storageDir.getAbsolutePath() - }; + String[] args = { "--upgrade", rhq48ServerDir.getAbsolutePath(), "--dir", storageDir.getAbsolutePath() }; CommandLine cmdLine = parser.parse(installer.getOptions(), args); int status = installer.run(cmdLine); @@ -383,8 +379,8 @@ public class StorageInstallerTest { // If this check fails, make sure that the expected value matches the value in // src/test/resources/rhq48/storage/conf/cassandra-env.sh - assertEquals(properties.getProperty("jmx_port"), "7399", "Failed to update the JMX port in " + - cassandraJvmPropsFile); + assertEquals(properties.getProperty("jmx_port"), "7399", "Failed to update the JMX port in " + + cassandraJvmPropsFile); File yamlFile = new File(confDir, "cassandra.yaml"); ConfigEditor newYamlEditor = new ConfigEditor(yamlFile); @@ -395,8 +391,8 @@ public class StorageInstallerTest { assertEquals(newYamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", "Failed to set the internode_authenticator property in " + yamlFile); - assertEquals(newYamlEditor.getAuthenticator(), oldYamlEditor.getAuthenticator(), "The authenticator property " + - "is wrong"); + assertEquals(newYamlEditor.getAuthenticator(), oldYamlEditor.getAuthenticator(), "The authenticator property " + + "is wrong"); assertEquals(newYamlEditor.getCommitLogDirectory(), oldYamlEditor.getCommitLogDirectory(), "The commit_log property is wrong"); assertEquals(newYamlEditor.getDataFileDirectories(), oldYamlEditor.getDataFileDirectories(), @@ -405,8 +401,7 @@ public class StorageInstallerTest { "The listen_address property is wrong"); assertEquals(newYamlEditor.getNativeTransportPort(), oldYamlEditor.getNativeTransportPort(), "The native_transport_port property is wrong"); - assertEquals(newYamlEditor.getRpcAddress(), oldYamlEditor.getRpcAddress(), - "The rpc_address property is wrong"); + assertEquals(newYamlEditor.getRpcAddress(), oldYamlEditor.getRpcAddress(), "The rpc_address property is wrong"); assertEquals(newYamlEditor.getSavedCachesDirectory(), oldYamlEditor.getSavedCachesDirectory(), "The saved_caches_directory property is wrong"); assertEquals(newYamlEditor.getStoragePort(), oldYamlEditor.getStoragePort(), @@ -439,4 +434,24 @@ public class StorageInstallerTest { assertEquals(properties.getProperty("rhq.storage.cql-port"), "9142"); } + private static class SafeStorageInstaller extends StorageInstaller { + + @Override + protected Deployer getDeployer() { + return new SafeDeployer(); + } + } + + private static class SafeDeployer extends Deployer { + + @Override + public void applyChangesToWindowsServiceWrapper(File deployDir) throws DeploymentException { + // Not every test env will have this file set up. If it doesn't exist just skip this. + File wrapperDir = new File(deployDir, "../bin/wrapper"); + File wrapperEnvFile = new File(wrapperDir, "rhq-storage-wrapper.env"); + if (wrapperEnvFile.isFile()) { + super.applyChangesToWindowsServiceWrapper(deployDir); + } + } + } } diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 1f28f14..41e8931 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -818,8 +818,8 @@ rhq.storage.nodes= # and used by the RHQ server(s) to communicate with the cluster. # Both properties are required. # -rhq.storage.cql-port=${rhq.cassandra.native-transport-port} -rhq.storage.gossip-port=${rhq.cassandra.storage.port} +rhq.storage.cql-port=${rhq.storage.cql-port} +rhq.storage.gossip-port=${rhq.storage.gossip-port} # If enabled data sent to and from storage nodes will be compressed using # snappy (https://code.google.com/p/snappy) compression. Note that this is an @@ -832,7 +832,7 @@ rhq.storage.gossip-port=${rhq.cassandra.storage.port} # # Please make sure you do not find the above log statement in your storage logs # before you enable client compression. -# rhq.cassandra.client.compression-enabled=false +# rhq.storage.client.compression-enabled=false </echo> <echo file="${rhq.bin.dir}/rhq-storage.properties">#################### RHQ Storage Configuration Properties #################### @@ -847,7 +847,7 @@ rhq.storage.gossip-port=${rhq.cassandra.storage.port} ############################################################################# # Data Directory Settings # ----------------- -# Note, the RHQ_HOME directory as used below is the parent directory +# The RHQ_HOME directory as used below is the parent directory # of the RHQ server installation. It is recommended that RHQ be installed # under an umbrella "rhq" directory. For example, if using a home directory # of /opt/rhq then the default installation structure would be: @@ -860,81 +860,99 @@ rhq.storage.gossip-port=${rhq.cassandra.storage.port} # /opt/rhq/rhq-data/storage/data # /opt/rhq/rhq-data/storage/saved_caches # -# commitlog The directory where the storage node keeps commit log files. +# IMPORTANT: Always use forward slashes in the directory path names, even +# on Windows! +# +# IMPORTANT: If using non-default settings for the data, commitlog, and/or +# saved-caches directories, each directory should be unique, +# typically under a common parent. +# +# rhq.storage.commitlog +# The directory where the storage node keeps commit log files. # Defaults to: RHQ_HOME/rhq-data/storage/commitlog -# data The directory where the storage node keeps data files. +# rhq.storage.data +# The directory where the storage node keeps data files. # Defaults to: RHQ_HOME/rhq-data/storage/data -# saved-caches The directory where the storage node keeps saved cache files. +# rhq.storage.saved-caches +# The directory where the storage node keeps saved cache files. # Defaults to: RHQ_HOME/rhq-data/storage/saved_caches ############################################################################# -${comment}commitlog=${rhq.storage.commitlog} -${comment}data=${rhq.storage.data} -${comment}saved-caches=${rhq.storage.saved-caches} +${comment}rhq.storage.commitlog=${rhq.storage.commitlog} +${comment}rhq.storage.data=${rhq.storage.data} +${comment}rhq.storage.saved-caches=${rhq.storage.saved-caches} ############################################################################# # Heap/Memory Settings # ----------------- # -# heap-size The value to use for both the min and max heap. This value is +# rhq.storage.heap-size +# The value to use for both the min and max heap. This value is # passed directly to the -Xms and -Xmx options of the Java # executable. # Defaults to 512M. -# heap-new-size The value to use for the new generation of the heap. This +# rhq.storage.heap-new-size +# The value to use for the new generation of the heap. This # value is passed directly to the -Xmn option of the Java # executable. -# Defaults to 256M. -# stack-size The value to use for the thread stack size. This value is +# Defaults to 128M. +# rhq.storage.stack-size +# The value to use for the thread stack size. This value is # passed directly to the -Xss option of the Java executable. # Defaults to 256k. ############################################################################# -${comment}heap-size=${rhq.storage.heap-size} -${comment}heap-new-size=${rhq.storage.heap-new-size} -#stack-size= +${comment}rhq.storage.heap-size=${rhq.storage.heap-size} +${comment}rhq.storage.heap-new-size=${rhq.storage.heap-new-size} +#rhq.storage.stack-size= ############################################################################# # Port Settings # ----------------- # -# client-port The port on which to listen for client requests. -# Defaults to 9142 -# jmx-port The port on which to listen for JMX connections. +# rhq.storage.cql-port +# The port on which to listen for client requests. +# Defaults to 9142. +# rhq.storage.jmx-port +# The port on which to listen for JMX connections. # Defaults to 7299. -# storage-port The port on which to listen for requests from other nodes. -# Defaults to 7100 -# ssl-storage-port The port on which to listen for encrypted requests from -# other nodes. Only used when encryption is enabled. -# Defaults to 7101 +# rhq.storage.gossip-port +# The port on which to listen for requests from other nodes. +# Defaults to 7100. ############################################################################# -#client-port= -${comment}jmx-port=${rhq.storage.jmx-port} -#storage-port= -#ssl-storage-port= +#rhq.storage.cql-port= +${comment}rhq.storage.jmx-port=${rhq.storage.jmx-port} +#rhq.storage.gossip-port= ############################################################################# # Address/Host Settings # ----------------- # -# hostname The hostname or IP address on which the node will listen +# rhq.storage.hostname +# The hostname or IP address on which the node will listen # for requests. -# Defaults to the hostname for localhost. -# seeds A comma-delimited list of hostnames or IP addresses that +# Defaults to this node's hostname. +# rhq.storage.seeds +# A comma-delimited list of hostnames or IP addresses that # serve as contact points. Nodes use this list to find each # other and to learn the cluster topology. It does not need # to specify all nodes in the cluster. # Defaults to this node's hostname. ############################################################################# -${comment}hostname=${rhq.storage.hostname} -${comment}seeds=${rhq.storage.seeds} +${comment}rhq.storage.hostname=${rhq.storage.hostname} +${comment}rhq.storage.seeds=${rhq.storage.seeds} ############################################################################# # Advanced Settings # ----------------- # -# verify-data-dirs-empty If true then allow installation only when the data -# directories are empty. Only upgrade is allowed. +# rhq.storage.verify-data-dirs-empty +# If true then allow installation only when the data +# directories are empty. Typically set true only in +# development environments when it may be useful to +# perform a clean installation while maintaining +# existing data. Defaults to true. # Defaults to true. ############################################################################# -${comment}verify-data-dirs-empty=${rhq.storage.verify-data-dirs-empty} +${comment}rhq.storage.verify-data-dirs-empty=${rhq.storage.verify-data-dirs-empty} </echo> </target> diff --git a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy index c20e0ed..7cdbf9e 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy +++ b/modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy @@ -89,15 +89,15 @@ def createStoragePropertiesFile(basedir, nodeId) { propsFile.withWriter { writer -> writer.write("""# storage installer options for dev deployment -commitlog=${dataRootDir}/storage-$nodeId/commit_log -data=${dataRootDir}/storage-$nodeId/data -saved-caches=${dataRootDir}/storage-$nodeId/saved_caches -heap-size=${heapSize} -heap-new-size=${heapNewSize} -hostname=127.0.0.$nodeId -jmx-port=${defaultJmxPort + (nodeId - 1)} -seeds=${seeds} -verify-data-dirs-empty=false +rhq.storage.commitlog=${dataRootDir}/storage-$nodeId/commit_log +rhq.storage.data=${dataRootDir}/storage-$nodeId/data +rhq.storage.saved-caches=${dataRootDir}/storage-$nodeId/saved_caches +rhq.storage.heap-size=${heapSize} +rhq.storage.heap-new-size=${heapNewSize} +rhq.storage.hostname=127.0.0.$nodeId +rhq.storage.jmx-port=${defaultJmxPort + (nodeId - 1)} +rhq.storage.seeds=${seeds} +rhq.storage.verify-data-dirs-empty=false """ ) } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 1d2f817..1dc2758 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -485,6 +485,12 @@ public class Upgrade extends AbstractInstall { oldServerProps.setProperty("rhq.storage.cql-port", cqlPort); } + String storageCompression = oldServerProps.getProperty("rhq.cassandra.client.compression-enabled"); + if (storageCompression != null) { + oldServerProps.remove("rhq.cassandra.client.compression-enabled"); + oldServerProps.setProperty("rhq.storage.client.compression-enabled", storageCompression); + } + // copy the old key/truststore files from the old location to the new server configuration directory copyReferredFile(commandLine, oldServerProps, "rhq.server.tomcat.security.keystore.file"); copyReferredFile(commandLine, oldServerProps, "rhq.server.tomcat.security.truststore.file"); diff --git a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java index f716ddb..bae3c1d 100644 --- a/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java +++ b/modules/plugins/rhq-storage/src/test/java/org/rhq/plugins/storage/StorageNodeComponentITest.java @@ -113,8 +113,8 @@ public class StorageNodeComponentITest { deploymentOptions.setSavedCachesDir(new File(basedir, "saved_caches").getAbsolutePath()); deploymentOptions.setCommitLogDir(new File(basedir, "logs").getAbsolutePath()); deploymentOptions.setLoggingLevel("DEBUG"); - deploymentOptions.setStoragePort(7200); - deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setGossipPort(7200); + deploymentOptions.setCqlPort(9142); deploymentOptions.setJmxPort(7399); deploymentOptions.setHeapSize("256M"); deploymentOptions.setHeapNewSize("64M"); @@ -309,8 +309,8 @@ public class StorageNodeComponentITest { deploymentOptions.setSavedCachesDir(new File(node2Basedir, "saved_caches").getAbsolutePath()); deploymentOptions.setCommitLogDir(new File(node2Basedir, "logs").getAbsolutePath()); deploymentOptions.setLoggingLevel("DEBUG"); - deploymentOptions.setStoragePort(7200); - deploymentOptions.setNativeTransportPort(9142); + deploymentOptions.setGossipPort(7200); + deploymentOptions.setCqlPort(9142); deploymentOptions.setJmxPort(7400); deploymentOptions.setHeapSize("256M"); deploymentOptions.setHeapNewSize("64M");

10 years, 7 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - 2 commits - modules/core modules/enterprise

by Simeon Pinder

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 29 ++++++---- 2 files changed, 21 insertions(+), 12 deletions(-) New commits: commit ef5f203efbd77817f65dc72f9bf300a89d5660c3 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 26 09:51:24 2013 -0400 A change to solve an ora test failure for SynchronizationManagerBeanTest#testExport, due to oracle treating "" as null for config settings initialized to "". diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java index 86bb1b8..4c2e4d4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java @@ -208,8 +208,8 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot public void setStorageClusterSettings(Subject subject, SystemSettings settings) { for (SystemSetting setting : settings.keySet()) { if (!isStorageSetting(setting)) { - throw new IllegalArgumentException(setting + " cannot be updated through this method. This method " + - "only allows updating of storage cluster settings."); + throw new IllegalArgumentException(setting + " cannot be updated through this method. This method " + + "only allows updating of storage cluster settings."); } } setSystemSettings(settings, false, true); @@ -255,12 +255,13 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot String existingValue = transformSystemConfigurationProperty(prop, existingConfig.getPropertyValue(), true); - if ((existingValue == null && value != null) || !existingValue.equals(value)) { + //also for oracle, treat null and empty string as the same. + if ((isEmpty(existingValue) && !isEmpty(value)) + || (null != existingValue && !existingValue.equals(value))) { //SystemSetting#isReadOnly should be a superset of the "fReadOnly" field in the database //but let's just be super paranoid here... - if ((prop.isReadOnly() - || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly().booleanValue())) && - !(isStorageSetting(prop) || updateStorageSettings)) { + if ((prop.isReadOnly() || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly() + .booleanValue())) && !(isStorageSetting(prop) || updateStorageSettings)) { throw new IllegalArgumentException("The setting [" + prop.getInternalName() + "] is read-only - you cannot change its current value! Current value is [" + existingConfig.getPropertyValue() + "] while the new value was [" + value + "]."); @@ -282,12 +283,20 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot cachedSystemSettings = null; } + private static boolean isEmpty(String string) { + return null == string || string.trim().isEmpty(); + } + private boolean isStorageSetting(SystemSetting setting) { switch (setting) { - case STORAGE_CQL_PORT: return true; - case STORAGE_GOSSIP_PORT: return true; - case STORAGE_AUTOMATIC_DEPLOYMENT: return true; - default: return false; + case STORAGE_CQL_PORT: + return true; + case STORAGE_GOSSIP_PORT: + return true; + case STORAGE_AUTOMATIC_DEPLOYMENT: + return true; + default: + return false; } } commit b9c792694d2ba6d604a7837cba71fc8644655ed9 Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Sep 26 09:50:11 2013 -0400 Revert " updating itest fix for oracle failures." This reverts commit 7abad911acaf15b7b0dd58af64df2be2c75c905a. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 223042a..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> </table>

10 years, 7 months

1
0
0 / 0

[rhq] 2 commits - .classpath modules/enterprise

by Jay Shaughnessy

.classpath | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 29 ++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) New commits: commit 3e2cc976d9d53517e718573cdb6969c6ac3fee31 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 26 09:53:31 2013 -0400 add another source path diff --git a/.classpath b/.classpath index 6985799..dfe7c43 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/common/cassandra-installer/src/test/java"/> <classpathentry kind="src" path="modules/enterprise/server/plugins/alertdef-rhq/src/main/java"/> <classpathentry kind="src" path="modules/common/cassandra-util/src/main/java"/> <classpathentry kind="src" path="modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/src/main/java"/> commit 0c079cf60e2b2667550ddec07c0299fa52526e92 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Sep 26 09:51:24 2013 -0400 A change to solve an ora test failure for SynchronizationManagerBeanTest#testExport, due to oracle treating "" as null for config settings initialized to "". diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java index 86bb1b8..4c2e4d4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java @@ -208,8 +208,8 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot public void setStorageClusterSettings(Subject subject, SystemSettings settings) { for (SystemSetting setting : settings.keySet()) { if (!isStorageSetting(setting)) { - throw new IllegalArgumentException(setting + " cannot be updated through this method. This method " + - "only allows updating of storage cluster settings."); + throw new IllegalArgumentException(setting + " cannot be updated through this method. This method " + + "only allows updating of storage cluster settings."); } } setSystemSettings(settings, false, true); @@ -255,12 +255,13 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot String existingValue = transformSystemConfigurationProperty(prop, existingConfig.getPropertyValue(), true); - if ((existingValue == null && value != null) || !existingValue.equals(value)) { + //also for oracle, treat null and empty string as the same. + if ((isEmpty(existingValue) && !isEmpty(value)) + || (null != existingValue && !existingValue.equals(value))) { //SystemSetting#isReadOnly should be a superset of the "fReadOnly" field in the database //but let's just be super paranoid here... - if ((prop.isReadOnly() - || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly().booleanValue())) && - !(isStorageSetting(prop) || updateStorageSettings)) { + if ((prop.isReadOnly() || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly() + .booleanValue())) && !(isStorageSetting(prop) || updateStorageSettings)) { throw new IllegalArgumentException("The setting [" + prop.getInternalName() + "] is read-only - you cannot change its current value! Current value is [" + existingConfig.getPropertyValue() + "] while the new value was [" + value + "]."); @@ -282,12 +283,20 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot cachedSystemSettings = null; } + private static boolean isEmpty(String string) { + return null == string || string.trim().isEmpty(); + } + private boolean isStorageSetting(SystemSetting setting) { switch (setting) { - case STORAGE_CQL_PORT: return true; - case STORAGE_GOSSIP_PORT: return true; - case STORAGE_AUTOMATIC_DEPLOYMENT: return true; - default: return false; + case STORAGE_CQL_PORT: + return true; + case STORAGE_GOSSIP_PORT: + return true; + case STORAGE_AUTOMATIC_DEPLOYMENT: + return true; + default: + return false; } }

10 years, 7 months

1
0
0 / 0

[rhq] modules/core

by Simeon Pinder

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2c0103fa83ddec0bbf224e892cf82680169d5eff Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Sep 26 09:50:11 2013 -0400 Revert " updating itest fix for oracle failures." This reverts commit 7abad911acaf15b7b0dd58af64df2be2c75c905a. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index 223042a..ebf7189 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> </table>

10 years, 7 months

1
0
0 / 0

[rhq] modules/core

by Simeon Pinder

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7abad911acaf15b7b0dd58af64df2be2c75c905a Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 25 19:13:00 2013 -0400 updating itest fix for oracle failures. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index ebf7189..223042a 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> </table>

10 years, 7 months

1
0
0 / 0

[rhq] Branch 'refs/tags/RHQ_4_7_0_JONCI' - 3 commits - modules/core

by rhqci

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e2150bf14a3333c336b91e2077e54e685cb15188 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Thu Sep 26 03:20:42 2013 -0400 tag RHQ_4_7_0_JONCI diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 9783c17..4aae357 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index df3c6b7..434edad 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index e27e9ae..86baa5a 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index ad356e9..5195e6e 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 1ee2365..dc9fcac 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 86298a7..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 4b78cec..8640d5b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index 7a5bf61..b817c60 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 44e3f9e..1b8bc61 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 0c341cd..fac3833 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 1a4e928..c62a28f 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 18d2ef8..800f5d1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a97a3f1..d3baf3b 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index a22d463..93f3805 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index cf49eb0..ef791fb 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index bff6e36..866f669 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 8a4966b..d31a6ad 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index fefcf36..f4b2afa 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 832fdd3..33e48b1 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index f6638aa..66df7dd 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index fd8e278..bbe0954 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 474988c..b560968 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index cdb3121..a06011c 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b3bcfd0..ff8a21b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index ce66cca..83c9dac 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ab06e9e..b59e15e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e25a193..710a585 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d076cd9..86a3e7e 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fdf355f..adf5bd4 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 8cb5215..2ed4c26 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 57987fd..e03ac78 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index a619439..97ed3ab 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 143ce73..b2c1184 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 72e7d1b..0820f4b 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 24a00ee..ecdde93 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index dcbfd30..9765a55 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 4935618a..2d97b0b 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index fcd9b26..c832b41 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 20854c9..c0554c6 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 8cd2d97..4d3b17e 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 0a1e19b..f3e07b4 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index e3de1bc..1ea7d61 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 908c109..d418db5 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 578f0ed..57c01e8 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index cf9088d..b418671 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 4e7d74c..53a1556 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index b946b2b..0ab8d0e 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index b6a7a04..22ee22b 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 1eac425..300e679 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d8527f8..427c5fb 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index ed18648..49e0186 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 982d3d3..a087cb1 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d445ed7..bbd87da 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 575a004..4b4ba59 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index f469ca5..aac6e73 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 50ab4c3..4c47992 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 7ef3212..1e36d6c 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 83d7b23..61830f3 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 91a653b..12215be 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 58a16f2..1af4fa8 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6a4b21c..f35a0a4 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 04dc335..c9c0a03 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index f9f2e6a..7af6f9d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 3f7c17a..4d8a07d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 44d1b10..abc220d 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index dc9d767..20c07de 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index e81935a..471003a 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index a1a6f8b..2457b0d 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index d32dddd..d620c92 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index eb14068..7e3cbe7 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 3e00528..54dcd5b 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 39b5ca5..317e61b 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 12758b4..36e246a 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 6aab82f..5551c92 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 56ad7b6..6f7ac53 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 1ef821f..8edfd9b 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 21145a5..32acda7 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 82c6669..02fd80d 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 7259db3..8689924 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index e497a9c..5833fee 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index c7caff8..7211f4c 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 93fe1f4..13b66fe 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 7d1797b..c86f705 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 117271d..6b28aa9 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 2449ed8..32d9a39 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index fd56fff..a6cdea1 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 1e9b481..bca927d 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 9c2ccf4..bb51ace 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 0c9d27c..713b1b4 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 7d57760..0d39f8e 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 03c2ce5..fc766fe 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 6350464..edf7c87 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 768ec0a..e63e38e 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index dd97e8f..a7ed4cc 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 26c709d..545b5db 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 36e76d8..718c14c 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index d5bd8e7..fa787c5 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9630bc8..84ef130 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index c31b804..0567602 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 63f1e62..df8b7ef 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 77ed069..ca3d81f 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0a616d3..0b0c363 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 4510e72..5e1f84c 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 8038922..777f236 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index da1ad51..ac50627 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 556c1e4..7c5748d 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 523406f..a7b8e47 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 167ab67..7c2d095 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a89a568..0c23814 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f96b173..71c5eca 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 679f9b3..56452fb 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index e16b1fd..6d5887e 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index bc7bca1..ddc9e9e 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0edf971..5f332a0 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9446a83..2f42e79 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 92dace7..dd1d4a3 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index ebdb5c0..d252d6c 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a3f17f4..a10b0f8 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 44ac23f..0d0eefa 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index a9e7295..e0e3cdc 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 092ac13..b31fd66 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 6853c1a..aaa9aa2 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index b32ee81..a35e582 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index dc08424..725187f 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index f4a7a88..00d0bda 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 993a215..1c8fe0f 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 44e9ce9..513f5b4 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index a8e46d8..69b26bf 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 18e79f9..6e2414b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index c3c0db9..ac3304d 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 206f2d7..bab062b 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index c1a9f61..21102b3 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9678528..c45ff85 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 06b5a80..a7df5f9 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index cd0c446..6f8216c 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 2160f12..6ac7fb2 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 1b10af4..766df02 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 4e18f5f..930f335 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 51af020..ba2069c 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index feb87c4..bf6fe94 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index bb904517..0cc62a9 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 414a2c4..4989446 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index f373663..a579f86 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 942836c..834091d 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 9269350..b3fce75 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c018eed..1f52ac4 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index b2c4587..539f1b9 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 404f7d6..ee7b2fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index fb12b85..834b985 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9f53f6f..b9f2b39 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 764fe67..beb0dd1 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f043ba1..f9bd9b1 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 67c4519..45d589a 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 01d0d24..f46c475 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 7fbac03..678e67f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 41280b9..70e298a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3d4ed73..3407cad 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index c305a40..b3d1503 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>pom</packaging> <name>RHQ</name> commit eb979512fd1166ca91effb9ee5764cc03f0dd643 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 25 19:13:00 2013 -0400 updating itest fix for oracle failures. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index ebf7189..223042a 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> </table> commit 481d6ba42ad99dadaaeb2403a0517dd6921d1803 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 25 10:00:00 2013 -0400 Revert "tag RHQ_4_7_0_JONCI" This reverts commit cdd8be9e0d4ab83cc9c39ce32ea06c503a2825c7. diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 4aae357..9783c17 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 434edad..df3c6b7 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 86baa5a..e27e9ae 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index 5195e6e..ad356e9 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index dc9fcac..1ee2365 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index b84d36c..86298a7 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 8640d5b..4b78cec 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index b817c60..7a5bf61 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 1b8bc61..44e3f9e 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index fac3833..0c341cd 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index c62a28f..1a4e928 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 800f5d1..18d2ef8 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index d3baf3b..a97a3f1 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 93f3805..a22d463 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index ef791fb..cf49eb0 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 866f669..bff6e36 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index d31a6ad..8a4966b 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index f4b2afa..fefcf36 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 33e48b1..832fdd3 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 66df7dd..f6638aa 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index bbe0954..fd8e278 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index b560968..474988c 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index a06011c..cdb3121 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index ff8a21b..b3bcfd0 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 83c9dac..ce66cca 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index b59e15e..ab06e9e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 710a585..e25a193 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 86a3e7e..d076cd9 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index adf5bd4..fdf355f 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 2ed4c26..8cb5215 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index e03ac78..57987fd 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 97ed3ab..a619439 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index b2c1184..143ce73 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0820f4b..72e7d1b 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index ecdde93..24a00ee 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9765a55..dcbfd30 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 2d97b0b..4935618a 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index c832b41..fcd9b26 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c0554c6..20854c9 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 4d3b17e..8cd2d97 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index f3e07b4..0a1e19b 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 1ea7d61..e3de1bc 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index d418db5..908c109 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 57c01e8..578f0ed 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index b418671..cf9088d 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 53a1556..4e7d74c 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index 0ab8d0e..b946b2b 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index 22ee22b..b6a7a04 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 300e679..1eac425 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 427c5fb..d8527f8 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 49e0186..ed18648 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index a087cb1..982d3d3 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index bbd87da..d445ed7 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 4b4ba59..575a004 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index aac6e73..f469ca5 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 4c47992..50ab4c3 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 1e36d6c..7ef3212 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 61830f3..83d7b23 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 12215be..91a653b 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 1af4fa8..58a16f2 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index f35a0a4..6a4b21c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index c9c0a03..04dc335 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 7af6f9d..f9f2e6a 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4d8a07d..3f7c17a 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index abc220d..44d1b10 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 20c07de..dc9d767 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 471003a..e81935a 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 2457b0d..a1a6f8b 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index d620c92..d32dddd 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 7e3cbe7..eb14068 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 54dcd5b..3e00528 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 317e61b..39b5ca5 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 36e246a..12758b4 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 5551c92..6aab82f 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 6f7ac53..56ad7b6 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8edfd9b..1ef821f 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 32acda7..21145a5 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 02fd80d..82c6669 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 8689924..7259db3 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 5833fee..e497a9c 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7211f4c..c7caff8 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 13b66fe..93fe1f4 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index c86f705..7d1797b 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 6b28aa9..117271d 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 32d9a39..2449ed8 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index a6cdea1..fd56fff 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index bca927d..1e9b481 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index bb51ace..9c2ccf4 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 713b1b4..0c9d27c 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 0d39f8e..7d57760 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index fc766fe..03c2ce5 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index edf7c87..6350464 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index e63e38e..768ec0a 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index a7ed4cc..dd97e8f 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 545b5db..26c709d 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 718c14c..36e76d8 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index fa787c5..d5bd8e7 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 84ef130..9630bc8 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 0567602..c31b804 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index df8b7ef..63f1e62 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index ca3d81f..77ed069 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0b0c363..0a616d3 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 5e1f84c..4510e72 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 777f236..8038922 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index ac50627..da1ad51 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 7c5748d..556c1e4 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index a7b8e47..523406f 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 7c2d095..167ab67 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0c23814..a89a568 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 71c5eca..f96b173 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 56452fb..679f9b3 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index 6d5887e..e16b1fd 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index ddc9e9e..bc7bca1 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 5f332a0..0edf971 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 2f42e79..9446a83 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index dd1d4a3..92dace7 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index d252d6c..ebdb5c0 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a10b0f8..a3f17f4 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 0d0eefa..44ac23f 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index e0e3cdc..a9e7295 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index b31fd66..092ac13 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index aaa9aa2..6853c1a 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index a35e582..b32ee81 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 725187f..dc08424 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 00d0bda..f4a7a88 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 1c8fe0f..993a215 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 513f5b4..44e9ce9 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 69b26bf..a8e46d8 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6e2414b..18e79f9 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index ac3304d..c3c0db9 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index bab062b..206f2d7 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 21102b3..c1a9f61 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index c45ff85..9678528 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index a7df5f9..06b5a80 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 6f8216c..cd0c446 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6ac7fb2..2160f12 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 766df02..1b10af4 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 930f335..4e18f5f 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index ba2069c..51af020 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index bf6fe94..feb87c4 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 0cc62a9..bb904517 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 4989446..414a2c4 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index a579f86..f373663 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 834091d..942836c 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index b3fce75..9269350 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 1f52ac4..c018eed 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 539f1b9..b2c4587 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index ee7b2fd..404f7d6 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index 834b985..fb12b85 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index b9f2b39..9f53f6f 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index beb0dd1..764fe67 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f9bd9b1..f043ba1 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 45d589a..67c4519 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index f46c475..01d0d24 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 678e67f..7fbac03 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 70e298a..41280b9 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3407cad..3d4ed73 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index b3d1503..c305a40 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.7.0.JON</version> + <version>4.9.0.JON320ER2</version> <packaging>pom</packaging> <name>RHQ</name>

10 years, 7 months

1
0
0 / 0

[rhq] Branch 'nightly/rhq.jon' - code-coverage/pom.xml modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

code-coverage/pom.xml | 2 +- modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/cassandra-auth/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml | 2 +- modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml | 2 +- modules/common/cassandra-ccm/pom.xml | 2 +- modules/common/cassandra-installer/pom.xml | 2 +- modules/common/cassandra-schema/pom.xml | 2 +- modules/common/cassandra-util/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as-dmr-client/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/arquillian-integration/suite-extension/pom.xml | 2 +- modules/core/arquillian-integration/test-agent-plugin/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/remoting-war/pom.xml | 2 +- modules/enterprise/gui/rest-examples-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/scripting/api/pom.xml | 4 ++-- modules/enterprise/scripting/javascript/pom.xml | 4 ++-- modules/enterprise/scripting/pom.xml | 4 ++-- modules/enterprise/scripting/python/pom.xml | 4 ++-- modules/enterprise/server/appserver/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/data-migration/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/installer/pom.xml | 2 +- modules/enterprise/server/itests-2/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/alertdef-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/server-control/pom.xml | 2 +- modules/enterprise/server/server-metrics/pom.xml | 2 +- modules/enterprise/server/startup-subsystem/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/metrics-simulator/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rest-docs-generator/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/integration-tests/rest-api/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/byteman/pom.xml | 2 +- modules/plugins/cassandra/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/noop/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/rhq-storage/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sonarqube/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 158 files changed, 179 insertions(+), 179 deletions(-) New commits: commit e2150bf14a3333c336b91e2077e54e685cb15188 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Thu Sep 26 03:20:42 2013 -0400 tag RHQ_4_7_0_JONCI diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 9783c17..4aae357 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-code-coverage</artifactId> diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index df3c6b7..434edad 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index e27e9ae..86baa5a 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml index ad356e9..5195e6e 100644 --- a/modules/common/cassandra-auth/pom.xml +++ b/modules/common/cassandra-auth/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-auth</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml index 1ee2365..dc9fcac 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-arquillian</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 86298a7..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-core</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml index 4b78cec..8640d5b 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-maven-plugin</artifactId> diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml index 7a5bf61..b817c60 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-cassandra-ccm</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-ccm-testng</artifactId> diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml index 44e3f9e..1b8bc61 100644 --- a/modules/common/cassandra-ccm/pom.xml +++ b/modules/common/cassandra-ccm/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-common-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml index 0c341cd..fac3833 100644 --- a/modules/common/cassandra-installer/pom.xml +++ b/modules/common/cassandra-installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-installer</artifactId> diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml index 1a4e928..c62a28f 100644 --- a/modules/common/cassandra-schema/pom.xml +++ b/modules/common/cassandra-schema/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-schema</artifactId> diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml index 18d2ef8..800f5d1 100644 --- a/modules/common/cassandra-util/pom.xml +++ b/modules/common/cassandra-util/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-cassandra-util</artifactId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index a97a3f1..d3baf3b 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index a22d463..93f3805 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml index cf49eb0..ef791fb 100644 --- a/modules/common/jboss-as-dmr-client/pom.xml +++ b/modules/common/jboss-as-dmr-client/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-dmr-client</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index bff6e36..866f669 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 8a4966b..d31a6ad 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index fefcf36..f4b2afa 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 832fdd3..33e48b1 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index f6638aa..66df7dd 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml index fd8e278..bbe0954 100644 --- a/modules/core/arquillian-integration/suite-extension/pom.xml +++ b/modules/core/arquillian-integration/suite-extension/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent>  diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml index 474988c..b560968 100644 --- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml +++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index cdb3121..a06011c 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index b3bcfd0..ff8a21b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index ce66cca..83c9dac 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index ab06e9e..b59e15e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index e25a193..710a585 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d076cd9..86a3e7e 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index fdf355f..adf5bd4 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 8cb5215..2ed4c26 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 57987fd..e03ac78 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index a619439..97ed3ab 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 143ce73..b2c1184 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 72e7d1b..0820f4b 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 24a00ee..ecdde93 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index dcbfd30..9765a55 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 4935618a..2d97b0b 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index fcd9b26..c832b41 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 20854c9..c0554c6 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 8cd2d97..4d3b17e 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 0a1e19b..f3e07b4 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index e3de1bc..1ea7d61 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 908c109..d418db5 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 578f0ed..57c01e8 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index cf9088d..b418671 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml index 4e7d74c..53a1556 100644 --- a/modules/enterprise/gui/remoting-war/pom.xml +++ b/modules/enterprise/gui/remoting-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml index b946b2b..0ab8d0e 100644 --- a/modules/enterprise/gui/rest-examples-war/pom.xml +++ b/modules/enterprise/gui/rest-examples-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index b6a7a04..22ee22b 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 1eac425..300e679 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index d8527f8..427c5fb 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index ed18648..49e0186 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 982d3d3..a087cb1 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index d445ed7..bbd87da 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml index 575a004..4b4ba59 100644 --- a/modules/enterprise/scripting/api/pom.xml +++ b/modules/enterprise/scripting/api/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting API</name> <description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description> diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml index f469ca5..aac6e73 100644 --- a/modules/enterprise/scripting/javascript/pom.xml +++ b/modules/enterprise/scripting/javascript/pom.xml @@ -4,10 +4,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-javascript</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Javascript support</name> <description>Provides RHQ scripting in Javascript using Rhino</description> diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml index 50ab4c3..4c47992 100644 --- a/modules/enterprise/scripting/pom.xml +++ b/modules/enterprise/scripting/pom.xml @@ -3,12 +3,12 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-parent</artifactId> <packaging>pom</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Scripting Parent Module</name> <modules> diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml index 7ef3212..1e36d6c 100644 --- a/modules/enterprise/scripting/python/pom.xml +++ b/modules/enterprise/scripting/python/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-scripting-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-scripting-python</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Python support</name> <description>Provides RHQ scripting in Python using Jython</description> diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index 83d7b23..61830f3 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 91a653b..12215be 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml index 58a16f2..1af4fa8 100644 --- a/modules/enterprise/server/data-migration/pom.xml +++ b/modules/enterprise/server/data-migration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6a4b21c..f35a0a4 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml index 04dc335..c9c0a03 100644 --- a/modules/enterprise/server/installer/pom.xml +++ b/modules/enterprise/server/installer/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index f9f2e6a..7af6f9d 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 3f7c17a..4d8a07d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 44d1b10..abc220d 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index dc9d767..20c07de 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index e81935a..471003a 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index a1a6f8b..2457b0d 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index d32dddd..d620c92 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index eb14068..7e3cbe7 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 3e00528..54dcd5b 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 39b5ca5..317e61b 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 12758b4..36e246a 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 6aab82f..5551c92 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml index 56ad7b6..6f7ac53 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml +++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 1ef821f..8edfd9b 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 21145a5..32acda7 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 82c6669..02fd80d 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 7259db3..8689924 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index e497a9c..5833fee 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index c7caff8..7211f4c 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 93fe1f4..13b66fe 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 7d1797b..c86f705 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 117271d..6b28aa9 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 2449ed8..32d9a39 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index fd56fff..a6cdea1 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 1e9b481..bca927d 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 9c2ccf4..bb51ace 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml index 0c9d27c..713b1b4 100644 --- a/modules/enterprise/server/server-control/pom.xml +++ b/modules/enterprise/server/server-control/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml index 7d57760..0d39f8e 100644 --- a/modules/enterprise/server/server-metrics/pom.xml +++ b/modules/enterprise/server/server-metrics/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml index 03c2ce5..fc766fe 100644 --- a/modules/enterprise/server/startup-subsystem/pom.xml +++ b/modules/enterprise/server/startup-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 6350464..edf7c87 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 768ec0a..e63e38e 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index dd97e8f..a7ed4cc 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml index 26c709d..545b5db 100644 --- a/modules/helpers/metrics-simulator/pom.xml +++ b/modules/helpers/metrics-simulator/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 36e76d8..718c14c 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index d5bd8e7..fa787c5 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml index 9630bc8..84ef130 100644 --- a/modules/helpers/rest-docs-generator/pom.xml +++ b/modules/helpers/rest-docs-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index c31b804..0567602 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 63f1e62..df8b7ef 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 77ed069..ca3d81f 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 0a616d3..0b0c363 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-test</artifactId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 4510e72..5e1f84c 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 8038922..777f236 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>jndi-access-remote-server</artifactId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index da1ad51..ac50627 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml index 556c1e4..7c5748d 100644 --- a/modules/integration-tests/rest-api/pom.xml +++ b/modules/integration-tests/rest-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-integration-tests</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 523406f..a7b8e47 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 167ab67..7c2d095 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a89a568..0c23814 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index f96b173..71c5eca 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 679f9b3..56452fb 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml index e16b1fd..6d5887e 100644 --- a/modules/plugins/cassandra/pom.xml +++ b/modules/plugins/cassandra/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index bc7bca1..ddc9e9e 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 0edf971..5f332a0 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 9446a83..2f42e79 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 92dace7..dd1d4a3 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index ebdb5c0..d252d6c 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index a3f17f4..a10b0f8 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 44ac23f..0d0eefa 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index a9e7295..e0e3cdc 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 092ac13..b31fd66 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 6853c1a..aaa9aa2 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index b32ee81..a35e582 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index dc08424..725187f 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index f4a7a88..00d0bda 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 993a215..1c8fe0f 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 44e9ce9..513f5b4 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index a8e46d8..69b26bf 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 18e79f9..6e2414b 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index c3c0db9..ac3304d 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 206f2d7..bab062b 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index c1a9f61..21102b3 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 9678528..c45ff85 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml index 06b5a80..a7df5f9 100644 --- a/modules/plugins/noop/pom.xml +++ b/modules/plugins/noop/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index cd0c446..6f8216c 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 2160f12..6ac7fb2 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 1b10af4..766df02 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 4e18f5f..930f335 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 51af020..ba2069c 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index feb87c4..bf6fe94 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index bb904517..0cc62a9 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 414a2c4..4989446 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index f373663..a579f86 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml index 942836c..834091d 100644 --- a/modules/plugins/rhq-storage/pom.xml +++ b/modules/plugins/rhq-storage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 9269350..b3fce75 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index c018eed..1f52ac4 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index b2c4587..539f1b9 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 404f7d6..ee7b2fd 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml index fb12b85..834b985 100644 --- a/modules/plugins/sonarqube/pom.xml +++ b/modules/plugins/sonarqube/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>rhq-sonarqube-plugin</artifactId> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9f53f6f..b9f2b39 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 764fe67..beb0dd1 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index f043ba1..f9bd9b1 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 67c4519..45d589a 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 01d0d24..f46c475 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 7fbac03..678e67f 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 41280b9..70e298a 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 3d4ed73..3407cad 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index c305a40..b3d1503 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.9.0.JON320ER2</version> + <version>4.7.0.JON</version> <packaging>pom</packaging> <name>RHQ</name>

10 years, 7 months

1
0
0 / 0

[rhq] Branch 'refs/tags/RHQ_4_9_0_JON320ER2' - modules/core

by rhqci

modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eb979512fd1166ca91effb9ee5764cc03f0dd643 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 25 19:13:00 2013 -0400 updating itest fix for oracle failures. diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml index ebf7189..223042a 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml @@ -148,9 +148,9 @@ <data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/> - <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> - <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/> + <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/> </table>

10 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits September 2013