Mercurial > hg > thermostat-ng > agent

changeset 2470:b8187bde7914

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update 0002_shared_osgi_spec_fixes.patch for tcp-socket plugin Reviewed-by: stooke Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-October/021165.html
author Jie Kang <jkang@redhat.com>
date Tue, 04 Oct 2016 11:21:55 -0400
parents cc3ad789a580
children 6c527f28ead0
files distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch
diffstat 1 files changed, 38 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Oct 04 10:09:17 2016 -0700
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Oct 04 11:21:55 2016 -0400
@@ -29,7 +29,7 @@
 diff --git a/agent/core/pom.xml b/agent/core/pom.xml
 --- a/agent/core/pom.xml
 +++ b/agent/core/pom.xml
-@@ -93,8 +93,8 @@
+@@ -124,8 +124,8 @@
        <version>${project.version}</version>
      </dependency>
      <dependency>
@@ -54,6 +54,20 @@
      </dependency>
      <dependency>
        <groupId>com.redhat.thermostat</groupId>
+diff --git a/agent/ipc/tcp-socket/server/pom.xml b/agent/ipc/tcp-socket/server/pom.xml
+--- a/agent/ipc/tcp-socket/server/pom.xml
++++ b/agent/ipc/tcp-socket/server/pom.xml
+@@ -62,8 +62,8 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>com.redhat.thermostat</groupId>
 diff --git a/agent/ipc/unix-socket/server/pom.xml b/agent/ipc/unix-socket/server/pom.xml
 --- a/agent/ipc/unix-socket/server/pom.xml
 +++ b/agent/ipc/unix-socket/server/pom.xml
@@ -188,7 +202,7 @@
 diff --git a/common/core/pom.xml b/common/core/pom.xml
 --- a/common/core/pom.xml
 +++ b/common/core/pom.xml
-@@ -179,18 +179,13 @@
+@@ -177,18 +177,13 @@
        <groupId>commons-cli</groupId>
        <artifactId>commons-cli</artifactId>
      </dependency>
@@ -618,7 +632,7 @@
 diff --git a/laf-utils/pom.xml b/laf-utils/pom.xml
 --- a/laf-utils/pom.xml
 +++ b/laf-utils/pom.xml
-@@ -135,14 +135,8 @@
+@@ -155,14 +155,8 @@
      </dependency>
      
      <dependency>
@@ -866,7 +880,7 @@
 diff --git a/pom.xml b/pom.xml
 --- a/pom.xml
 +++ b/pom.xml
-@@ -259,14 +259,26 @@
+@@ -293,14 +293,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>
      <!--
@@ -897,6 +911,26 @@
  
      <felix.scr.version>1.8.2</felix.scr.version>
      <felix.scr.annotations.version>1.9.12</felix.scr.annotations.version>
+diff --git a/process-handler/pom.xml b/process-handler/pom.xml
+--- a/process-handler/pom.xml
++++ b/process-handler/pom.xml
+@@ -77,14 +77,8 @@
+     </dependency>
+ 
+     <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.core</artifactId>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.osgi</groupId>
+-      <artifactId>org.osgi.compendium</artifactId>
+-      <scope>provided</scope>
++      <groupId>org.apache.felix</groupId>
++      <artifactId>org.apache.felix.framework</artifactId>
+     </dependency>
+     
+     <dependency>
 diff --git a/storage/cli/pom.xml b/storage/cli/pom.xml
 --- a/storage/cli/pom.xml
 +++ b/storage/cli/pom.xml
@@ -1046,26 +1080,6 @@
      </dependency>
  
      <dependency>
-diff --git a/process-handler/pom.xml b/process-handler/pom.xml
---- a/process-handler/pom.xml
-+++ b/process-handler/pom.xml
-@@ -77,14 +77,8 @@
-     </dependency>
- 
-     <dependency>
--      <groupId>org.osgi</groupId>
--      <artifactId>org.osgi.core</artifactId>
--      <scope>provided</scope>
--    </dependency>
--    <dependency>
--      <groupId>org.osgi</groupId>
--      <artifactId>org.osgi.compendium</artifactId>
--      <scope>provided</scope>
-+      <groupId>org.apache.felix</groupId>
-+      <artifactId>org.apache.felix.framework</artifactId>
-     </dependency>
-     
-     <dependency>
 diff --git a/vm-byteman/agent/pom.xml b/vm-byteman/agent/pom.xml
 --- a/vm-byteman/agent/pom.xml
 +++ b/vm-byteman/agent/pom.xml