Mercurial > hg > thermostat-ng > agent

changeset 2454:69dee5f97497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use felix-scr Activate annotation in AbstractCompleterCommand Use annotation provided by felix-scr-annotations rather than osgi.core. Keep OSGi Compendium dependency for common-core in OSGi spec patch. Required for AbstractCompleterCommand. Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-September/020911.html
author Andrew Azores <aazores@redhat.com>
date Fri, 16 Sep 2016 10:25:53 -0400
parents fe43ee562095
children 998669414ab4
files common/core/pom.xml common/core/src/main/java/com/redhat/thermostat/common/cli/AbstractCompleterCommand.java distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch
diffstat 3 files changed, 23 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/common/core/pom.xml	Wed Sep 14 15:32:59 2016 +0200
+++ b/common/core/pom.xml	Fri Sep 16 10:25:53 2016 -0400
@@ -165,6 +165,10 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr.annotations</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>jline</groupId>
--- a/common/core/src/main/java/com/redhat/thermostat/common/cli/AbstractCompleterCommand.java	Wed Sep 14 15:32:59 2016 +0200
+++ b/common/core/src/main/java/com/redhat/thermostat/common/cli/AbstractCompleterCommand.java	Fri Sep 16 10:25:53 2016 -0400
@@ -37,8 +37,8 @@
 package com.redhat.thermostat.common.cli;
 
 import com.redhat.thermostat.shared.locale.Translate;
+import org.apache.felix.scr.annotations.Activate;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
 
 import java.util.Collections;
 import java.util.Objects;
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Wed Sep 14 15:32:59 2016 +0200
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Fri Sep 16 10:25:53 2016 -0400
@@ -188,23 +188,27 @@
 diff --git a/common/core/pom.xml b/common/core/pom.xml
 --- a/common/core/pom.xml
 +++ b/common/core/pom.xml
-@@ -144,16 +144,6 @@
+@@ -179,18 +179,13 @@
+       <groupId>commons-cli</groupId>
        <artifactId>commons-cli</artifactId>
      </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>
--    </dependency>
-     
++
+     <dependency>
+       <groupId>org.osgi</groupId>
+       <artifactId>org.osgi.compendium</artifactId>
+       <scope>provided</scope>
+     </dependency>
+-    
++
      <dependency>
        <groupId>com.redhat.thermostat</groupId>
+       <artifactId>thermostat-annotations</artifactId>
 diff --git a/config/pom.xml b/config/pom.xml
 --- a/config/pom.xml
 +++ b/config/pom.xml
@@ -862,7 +866,7 @@
 diff --git a/pom.xml b/pom.xml
 --- a/pom.xml
 +++ b/pom.xml
-@@ -239,14 +239,26 @@
+@@ -259,14 +259,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>
      <!--
@@ -1065,7 +1069,7 @@
 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
-@@ -92,9 +92,8 @@
+@@ -112,9 +112,8 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -1080,7 +1084,7 @@
 diff --git a/vm-byteman/client-cli/pom.xml b/vm-byteman/client-cli/pom.xml
 --- a/vm-byteman/client-cli/pom.xml
 +++ b/vm-byteman/client-cli/pom.xml
-@@ -92,9 +92,8 @@
+@@ -93,9 +93,8 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -1110,7 +1114,7 @@
 diff --git a/vm-byteman/common/pom.xml b/vm-byteman/common/pom.xml
 --- a/vm-byteman/common/pom.xml
 +++ b/vm-byteman/common/pom.xml
-@@ -94,9 +94,8 @@
+@@ -107,9 +107,8 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -2169,7 +2173,7 @@
      </dependency>
  
      <dependency>
-@@ -96,10 +95,6 @@
+@@ -95,10 +94,6 @@
      <!-- httpclient 4.3 needs this bundle, but does only
           specify it's dep on it with scope provided -->
      <dependency>
@@ -2198,7 +2202,7 @@
 diff --git a/web/server/pom.xml b/web/server/pom.xml
 --- a/web/server/pom.xml
 +++ b/web/server/pom.xml
-@@ -131,9 +131,8 @@
+@@ -130,9 +130,8 @@
      </dependency>
  
      <dependency>