[rhq] Branch 'release/jon3.1.x' - .classpath modules/core modules/enterprise pom.xml

snegrea snegrea at fedoraproject.org
Tue Aug 28 18:26:47 UTC 2012


 .classpath                                                                                                        |    2 +-
 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java |    2 +-
 modules/core/native-system/ant-run.xml                                                                            |    2 +-
 modules/enterprise/agent/ant-run.xml                                                                              |    2 +-
 pom.xml                                                                                                           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5cfb0884b064a0ae5d61c25c00b2878afea655ff
Author: Stefan Negrea <snegrea at redhat.com>
Date:   Tue Aug 28 13:26:05 2012 -0500

    [BZ 852502] Update Sigar version.

diff --git a/.classpath b/.classpath
index 4630472..d06d607 100644
--- a/.classpath
+++ b/.classpath
@@ -234,7 +234,7 @@
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.0-801.jdbc4/postgresql-9.0-801.jdbc4.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/>
-	<classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-1/sigar-1.6.5.132-1.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.5.132-1/sigar-1.6.5.132-1-sources.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-2/sigar-1.6.5.132-2.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.5.132-2/sigar-1.6.5.132-2-sources.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar"/>
 	<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossws-spi/1.1.1.GA/jbossws-spi-1.1.1.GA.jar"/>
diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
index 054d9bb..118010a 100644
--- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
+++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
@@ -63,7 +63,7 @@ public class SigarInstaller {
                 .loadMetadataFromPom("pom.xml")
                 .goOffline()
                 // TODO (ips, 05/02/12): Figure out how to make this work without hard-coding the version.
-                .artifact("org.hyperic:sigar-dist:zip:1.6.5.132-1")
+                .artifact("org.hyperic:sigar-dist:zip:1.6.5.132-2")
                 .resolveAs(JavaArchive.class);
 
         if (sigars.size() > 1) {
diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
index da3abb7..6410e1b 100644
--- a/modules/core/native-system/ant-run.xml
+++ b/modules/core/native-system/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code.
    <!-- in case it wasn't passed in, assume the default location -->
    <property name="settings.localRepository" location="${user.home}/.m2/repository"/>
    <property name="project.version" value="3.0.0-SNAPSHOT"/>
-   <property name="sigar.version" value="1.6.5.132-1"/>
+   <property name="sigar.version" value="1.6.5.132-2"/>
    <property name="log4j.version" value="1.2.16"/>
 
    <fileset dir="${settings.localRepository}" id="jar.fileset">
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index 22249fe..94c8d75 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that provides ways to package the Agent.
    <!-- in case these weren't passed in (i.e. not invoked via maven), assume some defaults -->
    <property name="settings.localRepository" location="${user.home}/.m2/repository"/>
    <property name="project.version" value="2.0.0-SNAPSHOT"/>
-   <property name="sigar.version" value="1.6.5.132-1"/>
+   <property name="sigar.version" value="1.6.5.132-2"/>
    <property name="augeas.version" value="0.9.0"/>
    <property name="augeas.classifier" value="el5"/>
    <property name="augeas.zip.location" value="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}/"/>
diff --git a/pom.xml b/pom.xml
index e6b8095..24b6139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <jtds.version>1.2.2</jtds.version>
     <richfaces.version>3.3.3.Final</richfaces.version>
     <jline.version>0.9.94</jline.version>
-    <sigar.version>1.6.5.132-1</sigar.version>
+    <sigar.version>1.6.5.132-2</sigar.version>
     <sigar.zip.version>1.6.5</sigar.zip.version>
     <quartz.version>1.6.5</quartz.version>
     <jna.version>3.2.5</jna.version>




More information about the rhq-commits mailing list