Mercurial > hg > thermostat
changeset 2518:b3aaa70143e2
Fix pom for RPM
review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-November/021552.html
reviewed-by: jerboaa
| author | Mario Torre <neugens.limasoftware@gmail.com> |
|---|---|
| date | Thu, 10 Nov 2016 13:45:21 +0100 |
| parents | 0be4e0290bca |
| children | 8ffabc1db29a |
| files | distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch Wed Nov 09 18:50:13 2016 +0100 +++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch Thu Nov 10 13:45:21 2016 +0100 @@ -847,6 +847,21 @@ </dependency> <dependency> +diff --git a/platform/swing/compat/pom.xml b/platform/swing/compat/pom.xml +--- a/platform/swing/compat/pom.xml ++++ b/platform/swing/compat/pom.xml +@@ -61,9 +61,8 @@ + </dependency> + + <dependency> +- <groupId>org.osgi</groupId> +- <artifactId>org.osgi.core</artifactId> +- <scope>provided</scope> ++ <groupId>org.apache.felix</groupId> ++ <artifactId>org.apache.felix.framework</artifactId> + </dependency> + + <dependency> diff --git a/platform/swing/core/pom.xml b/platform/swing/core/pom.xml --- a/platform/swing/core/pom.xml +++ b/platform/swing/core/pom.xml @@ -948,7 +963,7 @@ diff --git a/system-backend/pom.xml b/system-backend/pom.xml --- a/system-backend/pom.xml +++ b/system-backend/pom.xml -@@ -87,14 +87,8 @@ +@@ -147,14 +147,8 @@ </dependency> <dependency>