|
 |
8aa4af |
diff --git a/agent/cli/pom.xml b/agent/cli/pom.xml
|
|
|
8aa4af |
--- a/agent/cli/pom.xml
|
|
|
8aa4af |
+++ b/agent/cli/pom.xml
|
|
|
8aa4af |
@@ -97,8 +97,8 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/agent/command/pom.xml b/agent/command/pom.xml
|
|
|
8aa4af |
--- a/agent/command/pom.xml
|
|
|
8aa4af |
+++ b/agent/command/pom.xml
|
|
|
8aa4af |
@@ -76,8 +76,8 @@
|
|
|
8aa4af |
<artifactId>netty</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/agent/core/pom.xml b/agent/core/pom.xml
|
|
|
8aa4af |
--- a/agent/core/pom.xml
|
|
|
8aa4af |
+++ b/agent/core/pom.xml
|
|
|
8aa4af |
@@ -88,8 +88,8 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.sun</groupId>
|
|
|
8aa4af |
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
|
|
|
8aa4af |
--- a/client/cli/pom.xml
|
|
|
8aa4af |
+++ b/client/cli/pom.xml
|
|
|
8aa4af |
@@ -101,14 +101,8 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/client/command/pom.xml b/client/command/pom.xml
|
|
|
8aa4af |
--- a/client/command/pom.xml
|
|
|
8aa4af |
+++ b/client/command/pom.xml
|
|
|
8aa4af |
@@ -76,9 +76,8 @@
|
|
|
8aa4af |
<artifactId>netty</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/client/core/pom.xml b/client/core/pom.xml
|
|
|
8aa4af |
--- a/client/core/pom.xml
|
|
|
8aa4af |
+++ b/client/core/pom.xml
|
|
|
8aa4af |
@@ -96,14 +96,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
</dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/client/living-vm-filter/core/pom.xml b/client/living-vm-filter/core/pom.xml
|
|
|
8aa4af |
--- a/client/living-vm-filter/core/pom.xml
|
|
|
8aa4af |
+++ b/client/living-vm-filter/core/pom.xml
|
|
|
8aa4af |
@@ -90,15 +90,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
-
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/client/living-vm-filter/swing/pom.xml b/client/living-vm-filter/swing/pom.xml
|
|
|
8aa4af |
--- a/client/living-vm-filter/swing/pom.xml
|
|
|
8aa4af |
+++ b/client/living-vm-filter/swing/pom.xml
|
|
|
8aa4af |
@@ -92,15 +92,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
-
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/client/swing/pom.xml b/client/swing/pom.xml
|
|
|
8aa4af |
--- a/client/swing/pom.xml
|
|
|
8aa4af |
+++ b/client/swing/pom.xml
|
|
|
8aa4af |
@@ -110,14 +110,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/common/core/pom.xml b/common/core/pom.xml
|
|
|
8aa4af |
--- a/common/core/pom.xml
|
|
|
8aa4af |
+++ b/common/core/pom.xml
|
|
|
8aa4af |
@@ -145,16 +145,6 @@
|
|
|
8aa4af |
<artifactId>commons-cli</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.sun</groupId>
|
|
|
8aa4af |
diff --git a/config/pom.xml b/config/pom.xml
|
|
|
8aa4af |
--- a/config/pom.xml
|
|
|
8aa4af |
+++ b/config/pom.xml
|
|
|
8aa4af |
@@ -91,14 +91,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
|
|
|
8aa4af |
--- a/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
|
|
|
8aa4af |
+++ b/dev/multi-module-plugin-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
|
|
|
8aa4af |
@@ -85,11 +85,8 @@
|
|
|
8aa4af |
<requiredProperty key="gson-version">
|
|
|
8aa4af |
<defaultValue>${gson.version}</defaultValue>
|
|
|
8aa4af |
</requiredProperty>
|
|
|
8aa4af |
- <requiredProperty key="osgi-compendium-osgi-version">
|
|
|
8aa4af |
- <defaultValue>${osgi.compendium.osgi-version}</defaultValue>
|
|
|
8aa4af |
- </requiredProperty>
|
|
|
8aa4af |
- <requiredProperty key="osgi-compendium-bundle-symbolic-name">
|
|
|
8aa4af |
- <defaultValue>${osgi.compendium.bundle.symbolic-name}</defaultValue>
|
|
|
8aa4af |
+ <requiredProperty key="felix.framework.version">
|
|
|
8aa4af |
+ <defaultValue>${felix.framework.version}</defaultValue>
|
|
|
8aa4af |
</requiredProperty>
|
|
|
8aa4af |
</requiredProperties>
|
|
|
8aa4af |
<fileSets>
|
|
|
8aa4af |
diff --git a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
|
|
|
8aa4af |
--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
|
|
|
8aa4af |
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/agent/pom.xml
|
|
|
8aa4af |
@@ -52,8 +52,8 @@
|
|
|
8aa4af |
<dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
<scope>provided</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
|
|
|
8aa4af |
--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
|
|
|
8aa4af |
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/client-cli/pom.xml
|
|
|
8aa4af |
@@ -16,8 +16,8 @@
|
|
|
8aa4af |
<dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
<scope>provided</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
|
|
|
8aa4af |
--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
|
|
|
8aa4af |
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/pom.xml
|
|
|
8aa4af |
@@ -107,13 +107,13 @@
|
|
|
8aa4af |
<artifactId>junit</artifactId>
|
|
|
8aa4af |
<version>${symbol_dollar}{junit.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
+
|
|
|
8aa4af |
+ <dependency>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
+ <version>${symbol_dollar}{felix.framework.version}</version>
|
|
|
8aa4af |
+ </dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <version>${symbol_dollar}{osgi.core.version}</version>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
-
|
|
|
8aa4af |
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
|
|
|
8aa4af |
--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
|
|
|
8aa4af |
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/pom.xml
|
|
|
8aa4af |
@@ -61,8 +61,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
<scope>provided</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/host-cpu/agent/pom.xml b/host-cpu/agent/pom.xml
|
|
|
8aa4af |
--- a/host-cpu/agent/pom.xml
|
|
|
8aa4af |
+++ b/host-cpu/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-cpu/client-core/pom.xml b/host-cpu/client-core/pom.xml
|
|
|
8aa4af |
--- a/host-cpu/client-core/pom.xml
|
|
|
8aa4af |
+++ b/host-cpu/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-cpu/client-swing/pom.xml b/host-cpu/client-swing/pom.xml
|
|
|
8aa4af |
--- a/host-cpu/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/host-cpu/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/host-cpu/common/pom.xml b/host-cpu/common/pom.xml
|
|
|
8aa4af |
--- a/host-cpu/common/pom.xml
|
|
|
8aa4af |
+++ b/host-cpu/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-memory/agent/pom.xml b/host-memory/agent/pom.xml
|
|
|
8aa4af |
--- a/host-memory/agent/pom.xml
|
|
|
8aa4af |
+++ b/host-memory/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-memory/client-core/pom.xml b/host-memory/client-core/pom.xml
|
|
|
8aa4af |
--- a/host-memory/client-core/pom.xml
|
|
|
8aa4af |
+++ b/host-memory/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-memory/client-swing/pom.xml b/host-memory/client-swing/pom.xml
|
|
|
8aa4af |
--- a/host-memory/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/host-memory/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/host-memory/common/pom.xml b/host-memory/common/pom.xml
|
|
|
8aa4af |
--- a/host-memory/common/pom.xml
|
|
|
8aa4af |
+++ b/host-memory/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-overview/client-core/pom.xml b/host-overview/client-core/pom.xml
|
|
|
8aa4af |
--- a/host-overview/client-core/pom.xml
|
|
|
8aa4af |
+++ b/host-overview/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/host-overview/client-swing/pom.xml b/host-overview/client-swing/pom.xml
|
|
|
8aa4af |
--- a/host-overview/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/host-overview/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/keyring/pom.xml b/keyring/pom.xml
|
|
|
8aa4af |
--- a/keyring/pom.xml
|
|
|
8aa4af |
+++ b/keyring/pom.xml
|
|
|
8aa4af |
@@ -170,14 +170,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/killvm/agent/pom.xml b/killvm/agent/pom.xml
|
|
|
8aa4af |
--- a/killvm/agent/pom.xml
|
|
|
8aa4af |
+++ b/killvm/agent/pom.xml
|
|
|
8aa4af |
@@ -103,8 +103,8 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
</dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/killvm/client-swing/pom.xml b/killvm/client-swing/pom.xml
|
|
|
8aa4af |
--- a/killvm/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/killvm/client-swing/pom.xml
|
|
|
8aa4af |
@@ -100,14 +100,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/killvm/command/pom.xml b/killvm/command/pom.xml
|
|
|
8aa4af |
--- a/killvm/command/pom.xml
|
|
|
8aa4af |
+++ b/killvm/command/pom.xml
|
|
|
8aa4af |
@@ -87,9 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/killvm/common/pom.xml b/killvm/common/pom.xml
|
|
|
8aa4af |
--- a/killvm/common/pom.xml
|
|
|
8aa4af |
+++ b/killvm/common/pom.xml
|
|
|
8aa4af |
@@ -88,16 +88,6 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
<groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
<artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
<version>4.2.0</version>
|
|
|
8aa4af |
@@ -120,4 +110,4 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
</dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
-</project>
|
|
|
8aa4af |
\ No newline at end of file
|
|
|
8aa4af |
+</project>
|
|
|
8aa4af |
diff --git a/laf-utils/pom.xml b/laf-utils/pom.xml
|
|
|
8aa4af |
--- a/laf-utils/pom.xml
|
|
|
8aa4af |
+++ b/laf-utils/pom.xml
|
|
|
8aa4af |
@@ -137,14 +137,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/notes/client-swing/pom.xml b/notes/client-swing/pom.xml
|
|
|
8aa4af |
--- a/notes/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/notes/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/notes/common/pom.xml b/notes/common/pom.xml
|
|
|
8aa4af |
--- a/notes/common/pom.xml
|
|
|
8aa4af |
+++ b/notes/common/pom.xml
|
|
|
8aa4af |
@@ -82,14 +82,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/numa/agent/pom.xml b/numa/agent/pom.xml
|
|
|
8aa4af |
--- a/numa/agent/pom.xml
|
|
|
8aa4af |
+++ b/numa/agent/pom.xml
|
|
|
8aa4af |
@@ -80,9 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/numa/client-core/pom.xml b/numa/client-core/pom.xml
|
|
|
8aa4af |
--- a/numa/client-core/pom.xml
|
|
|
8aa4af |
+++ b/numa/client-core/pom.xml
|
|
|
8aa4af |
@@ -83,14 +83,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/numa/client-swing/pom.xml b/numa/client-swing/pom.xml
|
|
|
8aa4af |
--- a/numa/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/numa/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/numa/common/pom.xml b/numa/common/pom.xml
|
|
|
8aa4af |
--- a/numa/common/pom.xml
|
|
|
8aa4af |
+++ b/numa/common/pom.xml
|
|
|
8aa4af |
@@ -82,14 +82,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/pom.xml b/pom.xml
|
|
|
8aa4af |
--- a/pom.xml
|
|
|
8aa4af |
+++ b/pom.xml
|
|
|
8aa4af |
@@ -177,14 +177,26 @@
|
|
|
8aa4af |
<lucene-analysis.bundle.symbolic-name>org.apache.servicemix.bundles.lucene-analyzers-common</lucene-analysis.bundle.symbolic-name>
|
|
|
8aa4af |
<lucene-core.bundle.symbolic-name>org.apache.servicemix.bundles.lucene</lucene-core.bundle.symbolic-name>
|
|
|
8aa4af |
|
|
|
8aa4af |
- felix 4.0 is compliant with osgi 4.3
|
|
|
8aa4af |
- for osgi clients, 4.3 is backwards compatible with 4.2
|
|
|
8aa4af |
+ Since we use felix framework at runtime, try to avoid introducing an
|
|
|
8aa4af |
+ extra dependency for OSGi API-only (e.g. org.osgi:org.osgi.core) in order to
|
|
|
8aa4af |
+ make packaging Thermostat easier. While org.osgi:org.osgi.core v4.3.x would
|
|
|
8aa4af |
+ satisfy OSGi 4.3 spec API, org.apache.felix:org.osgi.core v1.4 is OSGi 4.2 spec
|
|
|
8aa4af |
+ only at this point.
|
|
|
8aa4af |
+
|
|
|
8aa4af |
+ Felix framework 4.2 is an implementation of the 4.3 OSGi
|
|
|
8aa4af |
+ spec: https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+OSGi+R4.3+CT+Results
|
|
|
8aa4af |
+
|
|
|
8aa4af |
+ Note that between OSGi spec 4.2 and 4.3 generics (a.k.a type parameters)
|
|
|
8aa4af |
+ have been introduced. Howerver, felix's API-only package,
|
|
|
8aa4af |
+ org.apache.felix:org.osgi.core, is OSGi spec 4.2 and we use OSGi spec 4.3
|
|
|
8aa4af |
+ specific code in thermostat.
|
|
|
8aa4af |
+
|
|
|
8aa4af |
+ We should be careful not to introduce felix specific API, though.
|
|
|
8aa4af |
-->
|
|
|
8aa4af |
- <osgi.core.version>4.3.1</osgi.core.version>
|
|
|
8aa4af |
+ <felix.framework.version>4.2.0</felix.framework.version>
|
|
|
8aa4af |
<osgi.compendium.version>4.3.1</osgi.compendium.version>
|
|
|
8aa4af |
<osgi.compendium.osgi-version>4.3.1.201210102024</osgi.compendium.osgi-version>
|
|
|
8aa4af |
<osgi.compendium.bundle.symbolic-name>osgi.cmpn</osgi.compendium.bundle.symbolic-name>
|
|
|
8aa4af |
- <felix.framework.version>4.2.0</felix.framework.version>
|
|
|
8aa4af |
|
|
|
8aa4af |
<netty.version>3.2.4.Final</netty.version>
|
|
|
8aa4af |
<httpcomponents.core.version>4.3.2</httpcomponents.core.version>
|
|
|
8aa4af |
@@ -557,16 +569,6 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <version>${osgi.core.version}</version>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <version>${osgi.compendium.version}</version>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
<groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
<artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
<version>${felix.framework.version}</version>
|
|
|
8aa4af |
diff --git a/storage/cli/pom.xml b/storage/cli/pom.xml
|
|
|
8aa4af |
--- a/storage/cli/pom.xml
|
|
|
8aa4af |
+++ b/storage/cli/pom.xml
|
|
|
8aa4af |
@@ -67,8 +67,8 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/system-backend/pom.xml b/system-backend/pom.xml
|
|
|
8aa4af |
--- a/system-backend/pom.xml
|
|
|
8aa4af |
+++ b/system-backend/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
</dependencies>
|
|
|
8aa4af |
diff --git a/thread/client-common/pom.xml b/thread/client-common/pom.xml
|
|
|
8aa4af |
--- a/thread/client-common/pom.xml
|
|
|
8aa4af |
+++ b/thread/client-common/pom.xml
|
|
|
8aa4af |
@@ -73,14 +73,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/thread/client-controllers/pom.xml b/thread/client-controllers/pom.xml
|
|
|
8aa4af |
--- a/thread/client-controllers/pom.xml
|
|
|
8aa4af |
+++ b/thread/client-controllers/pom.xml
|
|
|
8aa4af |
@@ -74,14 +74,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/thread/client-swing/pom.xml b/thread/client-swing/pom.xml
|
|
|
8aa4af |
--- a/thread/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/thread/client-swing/pom.xml
|
|
|
8aa4af |
@@ -68,14 +68,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/thread/collector/pom.xml b/thread/collector/pom.xml
|
|
|
8aa4af |
--- a/thread/collector/pom.xml
|
|
|
8aa4af |
+++ b/thread/collector/pom.xml
|
|
|
8aa4af |
@@ -91,14 +91,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/thread/harvester/pom.xml b/thread/harvester/pom.xml
|
|
|
8aa4af |
--- a/thread/harvester/pom.xml
|
|
|
8aa4af |
+++ b/thread/harvester/pom.xml
|
|
|
8aa4af |
@@ -74,14 +74,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/unix-process-handler/pom.xml b/unix-process-handler/pom.xml
|
|
|
8aa4af |
--- a/unix-process-handler/pom.xml
|
|
|
8aa4af |
+++ b/unix-process-handler/pom.xml
|
|
|
8aa4af |
@@ -77,14 +77,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-classstat/agent/pom.xml b/vm-classstat/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-classstat/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-classstat/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-classstat/client-core/pom.xml b/vm-classstat/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-classstat/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-classstat/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-classstat/client-swing/pom.xml b/vm-classstat/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-classstat/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-classstat/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-classstat/common/pom.xml b/vm-classstat/common/pom.xml
|
|
|
8aa4af |
--- a/vm-classstat/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-classstat/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-compiler/agent/pom.xml b/vm-compiler/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-compiler/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-compiler/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-compiler/client-core/pom.xml b/vm-compiler/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-compiler/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-compiler/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-compiler/client-swing/pom.xml b/vm-compiler/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-compiler/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-compiler/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-compiler/common/pom.xml b/vm-compiler/common/pom.xml
|
|
|
8aa4af |
--- a/vm-compiler/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-compiler/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-cpu/agent/pom.xml b/vm-cpu/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-cpu/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-cpu/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-cpu/client-cli/pom.xml b/vm-cpu/client-cli/pom.xml
|
|
|
8aa4af |
--- a/vm-cpu/client-cli/pom.xml
|
|
|
8aa4af |
+++ b/vm-cpu/client-cli/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-cpu/client-core/pom.xml b/vm-cpu/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-cpu/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-cpu/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-cpu/client-swing/pom.xml b/vm-cpu/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-cpu/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-cpu/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-cpu/common/pom.xml b/vm-cpu/common/pom.xml
|
|
|
8aa4af |
--- a/vm-cpu/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-cpu/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-gc/agent/pom.xml b/vm-gc/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-gc/client-core/pom.xml b/vm-gc/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/client-core/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-gc/client-swing/pom.xml b/vm-gc/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-gc/command/pom.xml b/vm-gc/command/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/command/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/command/pom.xml
|
|
|
8aa4af |
@@ -67,15 +67,10 @@
|
|
|
8aa4af |
<version>${project.version}</version>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
+
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
<artifactId>thermostat-common-test</artifactId>
|
|
|
8aa4af |
diff --git a/vm-gc/common/pom.xml b/vm-gc/common/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-gc/remote-collector-client-common/pom.xml b/vm-gc/remote-collector-client-common/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/remote-collector-client-common/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/remote-collector-client-common/pom.xml
|
|
|
8aa4af |
@@ -68,14 +68,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-gc/remote-collector-client-swing/pom.xml b/vm-gc/remote-collector-client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/remote-collector-client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/remote-collector-client-swing/pom.xml
|
|
|
8aa4af |
@@ -68,14 +68,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-gc/remote-collector-command/pom.xml b/vm-gc/remote-collector-command/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/remote-collector-command/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/remote-collector-command/pom.xml
|
|
|
8aa4af |
@@ -68,14 +68,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-gc/remote-collector-common/pom.xml b/vm-gc/remote-collector-common/pom.xml
|
|
|
8aa4af |
--- a/vm-gc/remote-collector-common/pom.xml
|
|
|
8aa4af |
+++ b/vm-gc/remote-collector-common/pom.xml
|
|
|
8aa4af |
@@ -68,14 +68,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-heap-analysis/agent/pom.xml b/vm-heap-analysis/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-heap-analysis/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-heap-analysis/agent/pom.xml
|
|
|
8aa4af |
@@ -72,14 +72,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-heap-analysis/client-core/pom.xml b/vm-heap-analysis/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-heap-analysis/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-heap-analysis/client-core/pom.xml
|
|
|
8aa4af |
@@ -94,14 +94,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-heap-analysis/client-swing/pom.xml b/vm-heap-analysis/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-heap-analysis/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-heap-analysis/client-swing/pom.xml
|
|
|
8aa4af |
@@ -91,14 +91,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-heap-analysis/command/pom.xml b/vm-heap-analysis/command/pom.xml
|
|
|
8aa4af |
--- a/vm-heap-analysis/command/pom.xml
|
|
|
8aa4af |
+++ b/vm-heap-analysis/command/pom.xml
|
|
|
8aa4af |
@@ -93,14 +93,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-heap-analysis/common/pom.xml b/vm-heap-analysis/common/pom.xml
|
|
|
8aa4af |
--- a/vm-heap-analysis/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-heap-analysis/common/pom.xml
|
|
|
8aa4af |
@@ -93,14 +93,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
diff --git a/vm-io/agent/pom.xml b/vm-io/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-io/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-io/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-io/client-cli/pom.xml b/vm-io/client-cli/pom.xml
|
|
|
8aa4af |
--- a/vm-io/client-cli/pom.xml
|
|
|
8aa4af |
+++ b/vm-io/client-cli/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-io/client-core/pom.xml b/vm-io/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-io/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-io/client-core/pom.xml
|
|
|
8aa4af |
@@ -98,14 +98,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-io/client-swing/pom.xml b/vm-io/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-io/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-io/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-io/common/pom.xml b/vm-io/common/pom.xml
|
|
|
8aa4af |
--- a/vm-io/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-io/common/pom.xml
|
|
|
8aa4af |
@@ -98,14 +98,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-jmx/agent/pom.xml b/vm-jmx/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-jmx/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-jmx/agent/pom.xml
|
|
|
8aa4af |
@@ -86,14 +86,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-jmx/client-core/pom.xml b/vm-jmx/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-jmx/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-jmx/client-core/pom.xml
|
|
|
8aa4af |
@@ -88,14 +88,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-jmx/client-swing/pom.xml b/vm-jmx/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-jmx/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-jmx/client-swing/pom.xml
|
|
|
8aa4af |
@@ -96,14 +96,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-jmx/common/pom.xml b/vm-jmx/common/pom.xml
|
|
|
8aa4af |
--- a/vm-jmx/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-jmx/common/pom.xml
|
|
|
8aa4af |
@@ -88,14 +88,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-memory/agent/pom.xml b/vm-memory/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-memory/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-memory/agent/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-memory/client-cli/pom.xml b/vm-memory/client-cli/pom.xml
|
|
|
8aa4af |
--- a/vm-memory/client-cli/pom.xml
|
|
|
8aa4af |
+++ b/vm-memory/client-cli/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-memory/client-core/pom.xml b/vm-memory/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-memory/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-memory/client-core/pom.xml
|
|
|
8aa4af |
@@ -84,14 +84,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-memory/client-swing/pom.xml b/vm-memory/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-memory/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-memory/client-swing/pom.xml
|
|
|
8aa4af |
@@ -90,14 +90,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-memory/common/pom.xml b/vm-memory/common/pom.xml
|
|
|
8aa4af |
--- a/vm-memory/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-memory/common/pom.xml
|
|
|
8aa4af |
@@ -99,14 +99,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-numa/agent/pom.xml b/vm-numa/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-numa/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-numa/agent/pom.xml
|
|
|
8aa4af |
@@ -86,9 +86,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-numa/client-core/pom.xml b/vm-numa/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-numa/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-numa/client-core/pom.xml
|
|
|
8aa4af |
@@ -89,9 +89,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-numa/client-swing/pom.xml b/vm-numa/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-numa/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-numa/client-swing/pom.xml
|
|
|
8aa4af |
@@ -93,9 +93,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-numa/common/pom.xml b/vm-numa/common/pom.xml
|
|
|
8aa4af |
--- a/vm-numa/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-numa/common/pom.xml
|
|
|
8aa4af |
@@ -104,9 +104,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-overview/client-core/pom.xml b/vm-overview/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-overview/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-overview/client-core/pom.xml
|
|
|
8aa4af |
@@ -83,14 +83,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-overview/client-swing/pom.xml b/vm-overview/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-overview/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-overview/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-profiler/agent/pom.xml b/vm-profiler/agent/pom.xml
|
|
|
8aa4af |
--- a/vm-profiler/agent/pom.xml
|
|
|
8aa4af |
+++ b/vm-profiler/agent/pom.xml
|
|
|
8aa4af |
@@ -96,14 +96,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-profiler/client-cli/pom.xml b/vm-profiler/client-cli/pom.xml
|
|
|
8aa4af |
--- a/vm-profiler/client-cli/pom.xml
|
|
|
8aa4af |
+++ b/vm-profiler/client-cli/pom.xml
|
|
|
8aa4af |
@@ -80,14 +80,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-profiler/client-core/pom.xml b/vm-profiler/client-core/pom.xml
|
|
|
8aa4af |
--- a/vm-profiler/client-core/pom.xml
|
|
|
8aa4af |
+++ b/vm-profiler/client-core/pom.xml
|
|
|
8aa4af |
@@ -98,14 +98,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/vm-profiler/client-swing/pom.xml b/vm-profiler/client-swing/pom.xml
|
|
|
8aa4af |
--- a/vm-profiler/client-swing/pom.xml
|
|
|
8aa4af |
+++ b/vm-profiler/client-swing/pom.xml
|
|
|
8aa4af |
@@ -87,14 +87,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>org.jfree</groupId>
|
|
|
8aa4af |
diff --git a/vm-profiler/common/pom.xml b/vm-profiler/common/pom.xml
|
|
|
8aa4af |
--- a/vm-profiler/common/pom.xml
|
|
|
8aa4af |
+++ b/vm-profiler/common/pom.xml
|
|
|
8aa4af |
@@ -98,14 +98,8 @@
|
|
|
8aa4af |
<scope>test</scope>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
<groupId>com.redhat.thermostat</groupId>
|
|
|
8aa4af |
diff --git a/web/client/pom.xml b/web/client/pom.xml
|
|
|
8aa4af |
--- a/web/client/pom.xml
|
|
|
8aa4af |
+++ b/web/client/pom.xml
|
|
|
8aa4af |
@@ -64,9 +64,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
@@ -96,10 +95,6 @@
|
|
|
8aa4af |
|
|
|
8aa4af |
specify it's dep on it with scope provided -->
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.compendium</artifactId>
|
|
|
8aa4af |
- </dependency>
|
|
|
8aa4af |
- <dependency>
|
|
|
8aa4af |
<groupId>org.apache.httpcomponents</groupId>
|
|
|
8aa4af |
<artifactId>httpcore-osgi</artifactId>
|
|
|
8aa4af |
<version>${httpcomponents.core.version}</version>
|
|
|
8aa4af |
diff --git a/web/endpoint-plugin/web-service/pom.xml b/web/endpoint-plugin/web-service/pom.xml
|
|
|
8aa4af |
--- a/web/endpoint-plugin/web-service/pom.xml
|
|
|
8aa4af |
+++ b/web/endpoint-plugin/web-service/pom.xml
|
|
|
8aa4af |
@@ -54,9 +54,8 @@
|
|
|
8aa4af |
<dependencies>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
|
|
|
8aa4af |
diff --git a/web/server/pom.xml b/web/server/pom.xml
|
|
|
8aa4af |
--- a/web/server/pom.xml
|
|
|
8aa4af |
+++ b/web/server/pom.xml
|
|
|
8aa4af |
@@ -131,9 +131,8 @@
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|
|
|
8aa4af |
- <groupId>org.osgi</groupId>
|
|
|
8aa4af |
- <artifactId>org.osgi.core</artifactId>
|
|
|
8aa4af |
- <scope>provided</scope>
|
|
|
8aa4af |
+ <groupId>org.apache.felix</groupId>
|
|
|
8aa4af |
+ <artifactId>org.apache.felix.framework</artifactId>
|
|
|
8aa4af |
</dependency>
|
|
|
8aa4af |
|
|
|
8aa4af |
<dependency>
|