Mercurial > hg > thermostat-ng > agent

changeset 2436:7fedcccddf46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Packaging fixes for JNR dependencies update Reviewed-by: jerboaa, neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-August/020740.html
author Elliott Baron <ebaron@redhat.com>
date Tue, 30 Aug 2016 11:19:17 -0400
parents 2bb866bd090e
children 708035ffd62e
files distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch distribution/packaging/fedora/0003_rhel_lucene_4.patch distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch distribution/packaging/fedora/thermostat.spec
diffstat 4 files changed, 31 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Aug 30 11:18:08 2016 -0400
+++ b/distribution/packaging/fedora/0002_shared_osgi_spec_fixes.patch	Tue Aug 30 11:19:17 2016 -0400
@@ -67,7 +67,7 @@
 +      <artifactId>org.apache.felix.framework</artifactId>
      </dependency>
      <dependency>
-       <groupId>com.redhat.thermostat</groupId>
+       <groupId>com.github.jnr</groupId>
 diff --git a/client/cli/pom.xml b/client/cli/pom.xml
 --- a/client/cli/pom.xml
 +++ b/client/cli/pom.xml
--- a/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Tue Aug 30 11:18:08 2016 -0400
+++ b/distribution/packaging/fedora/0003_rhel_lucene_4.patch	Tue Aug 30 11:19:17 2016 -0400
@@ -2,7 +2,7 @@
 --- a/pom.xml
 +++ b/pom.xml
 @@ -232,8 +232,8 @@
-     <jffi.version>1.2.9</jffi.version>
+     <jffi.version>1.2.12</jffi.version>
  
      <jline.version>2.13</jline.version>
 -    <lucene.version>5.1.0_1</lucene.version>
--- a/distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch	Tue Aug 30 11:18:08 2016 -0400
+++ b/distribution/packaging/fedora/0004_shared-remove-jnr-assembly-exclusion.patch	Tue Aug 30 11:19:17 2016 -0400
@@ -1,26 +1,17 @@
 diff --git a/distribution/assembly/core-assembly.xml b/distribution/assembly/core-assembly.xml
 --- a/distribution/assembly/core-assembly.xml
 +++ b/distribution/assembly/core-assembly.xml
-@@ -77,22 +77,10 @@
+@@ -74,13 +74,9 @@
+         <include>com.redhat.thermostat:thermostat-laf-utils</include>
+         <include>org.osgi:org.osgi.compendium</include>
+         <include>org.apache:org.apache.felix.scr</include>
+-        <!-- Remove once upstream has OSGi metadata -->
+-        <include>com.redhat.thermostat:jnr-x86asm</include>
        </includes>
        <excludes>
          <exclude>org.osgi:org.osgi.core</exclude>
--        <!-- Exclude upstream jnr jars in favour of our wrapped bundles -->
--        <exclude>com.github.jnr:*</exclude>
+-        <!-- Exclude upstream jnr-x86asm jar in favour of our wrapped bundle -->
+-        <exclude>com.github.jnr:jnr-x86asm</exclude>
        </excludes>
        <useTransitiveDependencies>true</useTransitiveDependencies>
        <useTransitiveFiltering>true</useTransitiveFiltering>
-     </dependencySet>
--    <!-- Using another dependency set due to upstream jnr exclusion -->
--    <dependencySet>
--      <useProjectArtifact>false</useProjectArtifact>
--      <unpack>false</unpack>
--      <includes>
--        <!-- Include upstream jffi-native, since we don't wrap it -->
--        <include>com.github.jnr:jffi:jar:native</include>
--      </includes>
--      <useTransitiveDependencies>true</useTransitiveDependencies>
--    </dependencySet>
-   </dependencySets>
- </assembly>
- 
--- a/distribution/packaging/fedora/thermostat.spec	Tue Aug 30 11:18:08 2016 -0400
+++ b/distribution/packaging/fedora/thermostat.spec	Tue Aug 30 11:19:17 2016 -0400
@@ -59,21 +59,13 @@
   %global javax_servlet_bsn            javax.servlet-api
   # jnr-unixsocket and deps
   %global jnr_unixsocket_version     0.12.0
-  %global jnr_unixsocket_symbolic_name   com.github.jnr.unixsocket
   %global jnr_enxio_version          0.12.0
-  %global jnr_enxio_symbolic_name    com.github.jnr.enxio
   %global jnr_constants_version      0.9.2
-  %global jnr_constants_symbolic_name  com.github.jnr.constants
+  %global jnr_x86asm_symbolic_name   jnr.x86asm
   %global jnr_x86asm_version         1.0.2
   %global jffi_version               1.2.12
-  %global jffi_symbolic_name         com.github.jnr.jffi
-  # OSGi metadata added to upstream jnr-posix in version 3.0.17 and
-  # upstream jnr-ffi in version 2.0.4, which use different 
-  # Bundle-SymbolicNames than previous RPMs.
   %global jnr_posix_version          3.0.29
-  %global jnr_posix_symbolic_name    com.github.jnr.posix
   %global jnr_ffi_version            2.0.9
-  %global jnr_ffi_symbolic_name      com.github.jnr.ffi
   %global osgi_compendium_maven_version 1.4.0
 
 %else
@@ -100,22 +92,14 @@
   %global javax_servlet_bundle_version 3.0.0
   %global javax_servlet_bsn            javax.servlet
   # jnr-unixsocket and deps
-  %global jnr_unixsocket_version     0.8.0
-  %global jnr_enxio_version          0.9.0
-  %global jnr_constants_version      0.8.8
-  %global jnr_constants_symbolic_name  jnr.constants
+  %global jnr_unixsocket_version     0.12.0
+  %global jnr_enxio_version          0.12.0
+  %global jnr_constants_version      0.9.2
+  %global jnr_x86asm_symbolic_name   jnr.x86asm
   %global jnr_x86asm_version         1.0.2
-  %global jffi_version               1.2.9
-  %global jffi_symbolic_name         com.kenai.jffi
-  # OSGi metadata added to upstream jnr-posix in version 3.0.17 and
-  # upstream jnr-ffi in version 2.0.4, which use different 
-  # Bundle-SymbolicNames than previous RPMs.
-  %global jnr_posix_version          3.0.14
-  %global jnr_posix_symbolic_name    jnr.posix
-  %global jnr_ffi_version            2.0.3
-  %global jnr_ffi_symbolic_name      jnr.ffi
-  %global jnr_unixsocket_symbolic_name   jnr.unixsocket
-  %global jnr_enxio_symbolic_name    jnr.enxio
+  %global jffi_version               1.2.12
+  %global jnr_posix_version          3.0.29
+  %global jnr_ffi_version            2.0.9
   # Use compat version of 1 which is provided by the SCL-ized version
   # in our collection.
   %global osgi_compendium_maven_version 1
@@ -286,8 +270,8 @@
 # http://icedtea.classpath.org/hg/thermostat/rev/79df35f1ff13
 # Note: SCL-ized stack uses lucene 4.8 vs 5 in HEAD
 Patch3:     0003_rhel_lucene_4.patch
-# This patch can be pushed upstream when upstream JNR adds OSGi metadata to their
-# manifests. (e.g. https://github.com/jnr/jnr-unixsocket/pull/15 for jnr-unixsocket)
+# This patch can be removed when upstream jnr-x86asm adds OSGi metadata to its
+# manifest. See https://github.com/jnr/jnr-x86asm/pull/1
 Patch4:     0004_shared-remove-jnr-assembly-exclusion.patch
 
 %if 0%{?non_bootstrap_build}
@@ -418,13 +402,14 @@
 BuildRequires: %{?scl_prefix_java_common}osgi(%{javax_servlet_bsn}) = %{javax_servlet_bundle_version}
 BuildRequires: %{?scl_prefix_java_common}mvn(%{object_web_asm_maven_coords}) >= 5
 # jnr-unixsocket and deps
-BuildRequires: %{?scl_prefix}osgi(%{jnr_unixsocket_symbolic_name}) = %{jnr_unixsocket_version}
-BuildRequires: %{?scl_prefix}osgi(%{jnr_enxio_symbolic_name}) = %{jnr_enxio_version}
-BuildRequires: %{?scl_prefix}osgi(%{jnr_constants_symbolic_name}) = %{jnr_constants_version}
-BuildRequires: %{?scl_prefix}osgi(jnr.x86asm) = %{jnr_x86asm_version}
-BuildRequires: %{?scl_prefix}osgi(%{jnr_posix_symbolic_name}) = %{jnr_posix_version}
-BuildRequires: %{?scl_prefix}osgi(%{jnr_ffi_symbolic_name}) = %{jnr_ffi_version}
-BuildRequires: %{?scl_prefix}osgi(%{jffi_symbolic_name}) = %{jffi_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.unixsocket) = %{jnr_unixsocket_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.enxio) = %{jnr_enxio_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.constants) = %{jnr_constants_version}
+BuildRequires: %{?scl_prefix}osgi(%{jnr_x86asm_symbolic_name}) = %{jnr_x86asm_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.posix) = %{jnr_posix_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.ffi) = %{jnr_ffi_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.jffi) = %{jffi_version}
+BuildRequires: %{?scl_prefix}osgi(com.github.jnr.jffi.native) = %{jffi_version}
 
 %{?!scl:
 Requires: javapackages-tools
@@ -577,12 +562,7 @@
 %pom_xpath_inject "pom:properties" "<jline.version>%{jline_version}</jline.version>"
 # Don't use bundle-wrapped jnr-unixsocket and deps
 %pom_disable_module jnr-wrapped agent/ipc/unix-socket
-%pom_remove_dep com.redhat.thermostat:jnr-unixsocket agent/ipc/unix-socket/server
-%pom_remove_dep com.redhat.thermostat:jnr-unixsocket agent/ipc/unix-socket/client
-%pom_remove_dep com.redhat.thermostat:jnr-unixsocket agent/ipc/unix-socket/common
-%pom_add_dep com.github.jnr:jnr-unixsocket agent/ipc/unix-socket/server
-%pom_add_dep com.github.jnr:jnr-unixsocket agent/ipc/unix-socket/client
-%pom_add_dep com.github.jnr:jnr-unixsocket agent/ipc/unix-socket/common
+%pom_remove_dep com.redhat.thermostat:jnr-x86asm distribution
 
 # Don't use maven-exec-plugin. We do things manually in order to avoid this
 # additional dep. It's used in agent/core/pom.xml et.al.
@@ -755,17 +735,13 @@
                  -Dkxml2.version=%{kxml2_version} \
                  -Dosgi.compendium.version=%{osgi_compendium_maven_version} \
                  -Djnr-unixsocket.version=%{jnr_unixsocket_version} \
-                 -Djnr-unixsocket.bundle.symbolic.name=%{jnr_unixsocket_symbolic_name} \
                  -Djnr-enxio.version=%{jnr_enxio_version} \
-                 -Djnr-enxio.bundle.symbolic.name=%{jnr_enxio_symbolic_name} \
                  -Djnr-constants.version=%{jnr_constants_version} \
+                 -Djnr-x86asm.bundle.symbolic.name=%{jnr_x86asm_symbolic_name} \
                  -Djnr-x86asm.version=%{jnr_x86asm_version} \
-                 -Djnr-posix.bundle.symbolic.name=%{jnr_posix_symbolic_name} \
                  -Djnr-posix.version=%{jnr_posix_version} \
-                 -Djnr-ffi.bundle.symbolic.name=%{jnr_ffi_symbolic_name} \
                  -Djnr-ffi.version=%{jnr_ffi_version} \
-                 -Djffi.version=%{jffi_version} \
-                 -Djffi.bundle.symbolic.name=%{jffi_symbolic_name}
+                 -Djffi.version=%{jffi_version}
         
 
 %{?scl:EOF}