Mercurial > hg > release > thermostat-1.6

changeset 1910:67f0eb234d5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update fedora osgi patch with vm-numa plugin PR3011 Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-June/019333.html
author Jie Kang <jkang@redhat.com>
date Thu, 09 Jun 2016 11:17:11 -0400
parents 323e9c6e2192
children 49cb9ec05763
files distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch
diffstat 1 files changed, 63 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Thu Jun 09 09:32:01 2016 -0400
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Thu Jun 09 11:17:11 2016 -0400
@@ -482,7 +482,7 @@
 diff --git a/keyring/pom.xml b/keyring/pom.xml
 --- a/keyring/pom.xml
 +++ b/keyring/pom.xml
-@@ -146,14 +146,8 @@
+@@ -170,14 +170,8 @@
      </dependency>
      
      <dependency>
@@ -713,7 +713,7 @@
 diff --git a/pom.xml b/pom.xml
 --- a/pom.xml
 +++ b/pom.xml
-@@ -197,14 +197,26 @@
+@@ -177,14 +177,26 @@
      <lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name>
      <lucene-core.bundle.symbolic-name>org.apache.servicemix.bundles.lucene</lucene-core.bundle.symbolic-name>
      <!--
@@ -744,7 +744,7 @@
  
      <netty.version>3.2.4.Final</netty.version>
      <httpcomponents.core.version>4.3.2</httpcomponents.core.version>
-@@ -565,16 +577,6 @@
+@@ -555,16 +567,6 @@
        </dependency>
      
        <dependency>
@@ -1557,6 +1557,66 @@
      </dependency>
      <dependency>
        <groupId>com.redhat.thermostat</groupId>
+diff --git a/vm-numa/agent/pom.xml b/vm-numa/agent/pom.xml
+--- a/vm-numa/agent/pom.xml
++++ b/vm-numa/agent/pom.xml
+@@ -86,9 +86,8 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
+-      <scope>provided</scope>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>com.redhat.thermostat</groupId>
+diff --git a/vm-numa/client-core/pom.xml b/vm-numa/client-core/pom.xml
+--- a/vm-numa/client-core/pom.xml
++++ b/vm-numa/client-core/pom.xml
+@@ -89,9 +89,8 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
+-      <scope>provided</scope>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>com.redhat.thermostat</groupId>
+diff --git a/vm-numa/client-swing/pom.xml b/vm-numa/client-swing/pom.xml
+--- a/vm-numa/client-swing/pom.xml
++++ b/vm-numa/client-swing/pom.xml
+@@ -93,9 +93,8 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
+-      <scope>provided</scope>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>com.redhat.thermostat</groupId>
+diff --git a/vm-numa/common/pom.xml b/vm-numa/common/pom.xml
+--- a/vm-numa/common/pom.xml
++++ b/vm-numa/common/pom.xml
+@@ -104,9 +104,8 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
+-      <scope>provided</scope>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>com.redhat.thermostat</groupId>
 diff --git a/vm-overview/client-core/pom.xml b/vm-overview/client-core/pom.xml
 --- a/vm-overview/client-core/pom.xml
 +++ b/vm-overview/client-core/pom.xml