Mercurial > hg > release > thermostat-2.0

changeset 2569:0c7e9a8854c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build failures and remove hardcoded package version number Reviewed by: ebaron Review thread: http://icedtea.classpath.org/pipermail/thermostat/2017-January/022047.html
author Simon Tooke <stooke@redhat.com>
date Mon, 23 Jan 2017 14:57:27 -0500
parents b98beac5559c
children 027f92962a8a
files agent/ipc/server/pom.xml distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch distribution/packaging/fedora/thermostat.spec
diffstat 3 files changed, 44 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/agent/ipc/server/pom.xml	Mon Jan 23 10:11:31 2017 -0500
+++ b/agent/ipc/server/pom.xml	Mon Jan 23 14:57:27 2017 -0500
@@ -94,7 +94,7 @@
       <dependency>
           <groupId>com.redhat.thermostat</groupId>
           <artifactId>thermostat-common-portability</artifactId>
-          <version>1.99.12-SNAPSHOT</version>
+          <version>${project.version}</version>
       </dependency>
   </dependencies>
 
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Mon Jan 23 10:11:31 2017 -0500
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Mon Jan 23 14:57:27 2017 -0500
@@ -339,7 +339,35 @@
 +          <artifactId>org.apache.felix.framework</artifactId>
            <scope>provided</scope>
        </dependency>
+
+diff -r e8f49e39605d dev/ipc-test/test-launcher/pom.xml
+--- a/dev/ipc-test/test-launcher/pom.xml	Mon Jan 23 14:36:39 2017 -0500
++++ b/dev/ipc-test/test-launcher/pom.xml	Mon Jan 23 14:39:35 2017 -0500
+@@ -52,8 +52,8 @@
  
+   <dependencies>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>
+diff -r e8f49e39605d dev/ipc-test/test-server/pom.xml
+--- a/dev/ipc-test/test-server/pom.xml	Mon Jan 23 14:36:39 2017 -0500
++++ b/dev/ipc-test/test-server/pom.xml	Mon Jan 23 14:39:35 2017 -0500
+@@ -52,8 +52,8 @@
+ 
+   <dependencies>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>junit</groupId>
 diff --git a/host-cpu/agent/pom.xml b/host-cpu/agent/pom.xml
 --- a/host-cpu/agent/pom.xml
 +++ b/host-cpu/agent/pom.xml
@@ -1532,6 +1560,20 @@
      </dependency>
      <dependency>
        <groupId>com.redhat.thermostat</groupId>
+diff --git a/common/portability/pom.xml b/common/portability/pom.xml
+--- a/common/portability/pom.xml
++++ b/common/portability/pom.xml
+@@ -115,8 +115,8 @@
+             <version>${project.version}</version>
+         </dependency>
+         <dependency>
+-            <groupId>org.osgi</groupId>
+-            <artifactId>org.osgi.core</artifactId>
++            <groupId>org.apache.felix</groupId>
++            <artifactId>org.apache.felix.framework</artifactId>
+         </dependency>
+     </dependencies>
+
 diff --git a/vm-gc/remote-collector-client-common/pom.xml b/vm-gc/remote-collector-client-common/pom.xml
 --- a/vm-gc/remote-collector-client-common/pom.xml
 +++ b/vm-gc/remote-collector-client-common/pom.xml
--- a/distribution/packaging/fedora/thermostat.spec	Mon Jan 23 10:11:31 2017 -0500
+++ b/distribution/packaging/fedora/thermostat.spec	Mon Jan 23 14:57:27 2017 -0500
@@ -701,7 +701,7 @@
          src/main/java/com/redhat/thermostat/common/portability/HostName.java \
          src/main/java/com/redhat/thermostat/common/portability/UserNameUtil.java \
          src/main/java/com/redhat/thermostat/common/portability/UserNameLookupException.java \
-         src/main/java/com/redhat/thermostat/common/portability/internal/linux/UserNameUtilImpl.java
+         src/main/java/com/redhat/thermostat/common/portability/internal/linux/UserNameUtilImpl.java \
          src/main/java/com/redhat/thermostat/common/portability/internal/windows/WindowsHelperImpl.java
   make all
 popd