Mercurial > hg > thermostat-ng > agent

changeset 2434:46b76de8b058

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jnr-unixsocket and dependencies Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-August/020706.html
author Elliott Baron <ebaron@redhat.com>
date Tue, 30 Aug 2016 11:16:51 -0400
parents 2689d87205f2
children 2bb866bd090e
files agent/ipc/unix-socket/client/pom.xml agent/ipc/unix-socket/common/pom.xml agent/ipc/unix-socket/jnr-wrapped/jffi/pom.xml agent/ipc/unix-socket/jnr-wrapped/jnr-constants/pom.xml agent/ipc/unix-socket/jnr-wrapped/jnr-enxio/pom.xml agent/ipc/unix-socket/jnr-wrapped/jnr-ffi/pom.xml agent/ipc/unix-socket/jnr-wrapped/jnr-posix/pom.xml agent/ipc/unix-socket/jnr-wrapped/jnr-unixsocket/pom.xml agent/ipc/unix-socket/jnr-wrapped/pom.xml agent/ipc/unix-socket/server/pom.xml dev/ide-launcher/pom.xml distribution/assembly/core-assembly.xml distribution/config/commands/agent.properties distribution/config/commands/service.properties distribution/pom.xml pom.xml vm-byteman/distribution/thermostat-plugin.xml web/endpoint-plugin/distribution/thermostat-plugin.xml
diffstat 18 files changed, 48 insertions(+), 657 deletions(-) [+]
line wrap: on
line diff
--- a/agent/ipc/unix-socket/client/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/agent/ipc/unix-socket/client/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -62,7 +62,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.redhat.thermostat</groupId>
+      <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
     </dependency>
     <dependency>
--- a/agent/ipc/unix-socket/common/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/agent/ipc/unix-socket/common/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -52,7 +52,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.redhat.thermostat</groupId>
+      <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
     </dependency>
     <dependency>
--- a/agent/ipc/unix-socket/jnr-wrapped/jffi/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jffi</artifactId>
-  <packaging>bundle</packaging>
-  <version>1.2.9</version>
-
-  <name>Java Foreign Function Interface (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jffi</artifactId>
-      <version>${jffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jffi</artifactId>
-      <version>${jffi.version}</version>
-      <classifier>native</classifier>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jffi.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jffi.version}</Bundle-Version>
-            <Export-Package>
-              com.kenai.jffi*
-            </Export-Package>
-            <Main-Class>com.kenai.jffi.Main</Main-Class>
-            <Import-Package>!sun.misc,*</Import-Package>
-            <EmbedDependency>artifactId=jffi</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/jnr-constants/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jnr-constants</artifactId>
-  <packaging>bundle</packaging>
-  <version>0.8.7</version>
-
-  <name>Java Native Runtime Constants (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jnr-constants</artifactId>
-      <version>${jnr-constants.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jnr-constants.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jnr-constants.version}</Bundle-Version>
-            <Export-Package>
-              com.kenai.constantine*,
-              jnr.constants*
-            </Export-Package>
-            <EmbedDependency>artifactId=jnr-constants</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/jnr-enxio/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jnr-enxio</artifactId>
-  <packaging>bundle</packaging>
-  <version>0.9</version>
-
-  <name>Java Native Runtime Enhanced X-platform I/O (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jnr-enxio</artifactId>
-      <version>${jnr-enxio.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-ffi</artifactId>
-      <version>${jnr-ffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-constants</artifactId>
-      <version>${jnr-constants.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jnr-enxio.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jnr-enxio.version}</Bundle-Version>
-            <Export-Package>jnr.enxio.*</Export-Package>
-            <Import-Package>*,jnr.ffi.mapper,jnr.ffi.provider.converters,com.kenai.jffi</Import-Package>
-            <EmbedDependency>artifactId=jnr-enxio</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/jnr-ffi/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jnr-ffi</artifactId>
-  <packaging>bundle</packaging>
-  <version>2.0.3</version>
-
-  <name>Java Abstracted Foreign Function Layer (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jnr-ffi</artifactId>
-      <version>${jnr-ffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-util</artifactId>
-      <version>${asm.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jffi</artifactId>
-      <version>${jffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-x86asm</artifactId>
-      <version>${jnr-x86asm.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jnr-ffi.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jnr-ffi.version}</Bundle-Version>
-            <Export-Package>
-              jnr.ffi*
-            </Export-Package>
-            <EmbedDependency>artifactId=jnr-ffi</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/jnr-posix/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jnr-posix</artifactId>
-  <packaging>bundle</packaging>
-  <version>3.0.12</version>
-
-  <name>Java Posix Layer (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jnr-posix</artifactId>
-      <version>${jnr-posix.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-ffi</artifactId>
-      <version>${jnr-ffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-constants</artifactId>
-      <version>${jnr-constants.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jnr-posix.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jnr-posix.version}</Bundle-Version>
-            <Export-Package>jnr.posix*</Export-Package>
-            <Import-Package>!sun.misc,*</Import-Package>
-            <Implementation-Title>JNA-POSIX</Implementation-Title>
-            <Implementation-Version>0.5</Implementation-Version>
-            <EmbedDependency>artifactId=jnr-posix</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/jnr-unixsocket/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright 2012-2016 Red Hat, Inc.
-
- This file is part of Thermostat.
-
- Thermostat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- Thermostat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Thermostat; see the file COPYING.  If not see
- <http://www.gnu.org/licenses/>.
-
- Linking this code with other modules is making a combined work
- based on this code.  Thus, the terms and conditions of the GNU
- General Public License cover the whole combination.
-
- As a special exception, the copyright holders of this code give
- you permission to link this code with independent modules to
- produce an executable, regardless of the license terms of these
- independent modules, and to copy and distribute the resulting
- executable under terms of your choice, provided that you also
- meet, for each linked independent module, the terms and conditions
- of the license of that module.  An independent module is a module
- which is not derived from or based on this code.  If you modify
- this code, you may extend this exception to your version of the
- library, but you are not obligated to do so.  If you do not wish
- to do so, delete this exception statement from your version.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.redhat.thermostat</groupId>
-    <artifactId>thermostat-jnr-wrapped</artifactId>
-    <version>1.99.12-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>jnr-unixsocket</artifactId>
-  <packaging>bundle</packaging>
-  <version>0.8</version>
-
-  <name>Unix Sockets for Java (OSGi-wrapped)</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.github.jnr</groupId>
-      <artifactId>jnr-unixsocket</artifactId>
-      <version>${jnr-unixsocket.version}</version>
-    </dependency>
-
-    <!-- Define all our wrapped dependencies here, so they are included
-         in the build -->
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-ffi</artifactId>
-      <version>${jnr-ffi.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-enxio</artifactId>
-      <version>${jnr-enxio.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-constants</artifactId>
-      <version>${jnr-constants.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.redhat.thermostat</groupId>
-      <artifactId>jnr-posix</artifactId>
-      <version>${jnr-posix.version}</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-SymbolicName>${jnr-unixsocket.bundle.symbolic.name}</Bundle-SymbolicName>
-            <Bundle-Version>${jnr-unixsocket.version}</Bundle-Version>
-            <Import-Package>
-              *,jnr.ffi.mapper,jnr.ffi.provider.converters, 
-              jnr.ffi.provider.jffi,com.kenai.jffi
-            </Import-Package>
-            <Export-Package>jnr.unixsocket</Export-Package>
-            <EmbedDependency>artifactId=jnr-unixsocket</EmbedDependency>
-            <!-- Do not autogenerate uses clauses in Manifests -->
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
-
--- a/agent/ipc/unix-socket/jnr-wrapped/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/agent/ipc/unix-socket/jnr-wrapped/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -51,13 +51,7 @@
   <name>OSGi-wrapped JNR bundles</name>
 
   <modules>
-    <module>jnr-unixsocket</module>
-    <module>jnr-enxio</module>
-    <module>jnr-posix</module>
-    <module>jnr-constants</module>
-    <module>jnr-ffi</module>
     <module>jnr-x86asm</module>
-    <module>jffi</module>
   </modules>
 
   <build>
--- a/agent/ipc/unix-socket/server/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/agent/ipc/unix-socket/server/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -66,7 +66,7 @@
       <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.redhat.thermostat</groupId>
+      <groupId>com.github.jnr</groupId>
       <artifactId>jnr-unixsocket</artifactId>
     </dependency>
     <dependency>
--- a/dev/ide-launcher/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/dev/ide-launcher/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -64,7 +64,7 @@
          boot script has that added to the boot classpath.
     -->
     <dependency>
-      <groupId>com.redhat.thermostat</groupId>
+      <groupId>com.github.jnr</groupId>
       <artifactId>jffi</artifactId>
     </dependency>
   </dependencies>
--- a/distribution/assembly/core-assembly.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/distribution/assembly/core-assembly.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -74,25 +74,17 @@
         <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/config/commands/agent.properties	Fri Aug 26 14:08:00 2016 -0400
+++ b/distribution/config/commands/agent.properties	Tue Aug 30 11:16:51 2016 -0400
@@ -14,8 +14,8 @@
           com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
           com.redhat.thermostat.agent.ipc.common=${project.version}, \
           com.redhat.thermostat.agent.ipc.unixsocket.common=${project.version}, \
-          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.version}, \
-          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.version}, \
+          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.bundle.version}, \
+          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.bundle.version}, \
           ${jnr-constants.bundle.symbolic.name}=${jnr-constants.version}, \
           ${jnr-posix.bundle.symbolic.name}=${jnr-posix.version}, \
           ${jnr-ffi.bundle.symbolic.name}=${jnr-ffi.version}, \
--- a/distribution/config/commands/service.properties	Fri Aug 26 14:08:00 2016 -0400
+++ b/distribution/config/commands/service.properties	Tue Aug 30 11:16:51 2016 -0400
@@ -14,8 +14,8 @@
           com.redhat.thermostat.agent.ipc.unixsocket.server=${project.version}, \
           com.redhat.thermostat.agent.ipc.common=${project.version}, \
           com.redhat.thermostat.agent.ipc.unixsocket.common=${project.version}, \
-          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.version}, \
-          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.version}, \
+          ${jnr-unixsocket.bundle.symbolic.name}=${jnr-unixsocket.bundle.version}, \
+          ${jnr-enxio.bundle.symbolic.name}=${jnr-enxio.bundle.version}, \
           ${jnr-constants.bundle.symbolic.name}=${jnr-constants.version}, \
           ${jnr-posix.bundle.symbolic.name}=${jnr-posix.version}, \
           ${jnr-ffi.bundle.symbolic.name}=${jnr-ffi.version}, \
--- a/distribution/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/distribution/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -410,6 +410,11 @@
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
+      <artifactId>jnr-x86asm</artifactId>
+      <version>${jnr-x86asm.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
       <artifactId>thermostat-killvm-agent</artifactId>
       <version>${project.version}</version>
     </dependency>
--- a/pom.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/pom.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -233,20 +233,22 @@
     <commons-fileupload.version>1.2.2</commons-fileupload.version>
     
     <!-- jnr-unixsocket and dependencies -->
-    <jnr-unixsocket.bundle.symbolic.name>jnr.unixsocket</jnr-unixsocket.bundle.symbolic.name>
-    <jnr-unixsocket.version>0.8</jnr-unixsocket.version>
-    <jnr-enxio.bundle.symbolic.name>jnr.enxio</jnr-enxio.bundle.symbolic.name>
-    <jnr-enxio.version>0.9</jnr-enxio.version>
-    <jnr-constants.bundle.symbolic.name>jnr.constants</jnr-constants.bundle.symbolic.name>
-    <jnr-constants.version>0.8.7</jnr-constants.version>
-    <jnr-posix.bundle.symbolic.name>jnr.posix</jnr-posix.bundle.symbolic.name>
-    <jnr-posix.version>3.0.12</jnr-posix.version>
-    <jnr-ffi.bundle.symbolic.name>jnr.ffi</jnr-ffi.bundle.symbolic.name>
-    <jnr-ffi.version>2.0.3</jnr-ffi.version>
-    <jnr-x86asm.bundle.symbolic.name>jnr.x86asm</jnr-x86asm.bundle.symbolic.name>
+    <jnr-unixsocket.bundle.symbolic.name>com.github.jnr.unixsocket</jnr-unixsocket.bundle.symbolic.name>
+    <jnr-unixsocket.version>0.12</jnr-unixsocket.version>
+    <jnr-unixsocket.bundle.version>0.12.0</jnr-unixsocket.bundle.version>
+    <jnr-enxio.bundle.symbolic.name>com.github.jnr.enxio</jnr-enxio.bundle.symbolic.name>
+    <jnr-enxio.version>0.12</jnr-enxio.version>
+    <jnr-enxio.bundle.version>0.12.0</jnr-enxio.bundle.version>
+    <jnr-constants.bundle.symbolic.name>com.github.jnr.constants</jnr-constants.bundle.symbolic.name>
+    <jnr-constants.version>0.9.2</jnr-constants.version>
+    <jnr-posix.bundle.symbolic.name>com.github.jnr.posix</jnr-posix.bundle.symbolic.name>
+    <jnr-posix.version>3.0.29</jnr-posix.version>
+    <jnr-ffi.bundle.symbolic.name>com.github.jnr.ffi</jnr-ffi.bundle.symbolic.name>
+    <jnr-ffi.version>2.0.9</jnr-ffi.version>
+    <jnr-x86asm.bundle.symbolic.name>com.github.jnr.x86asm</jnr-x86asm.bundle.symbolic.name>
     <jnr-x86asm.version>1.0.2</jnr-x86asm.version>
-    <jffi.bundle.symbolic.name>com.kenai.jffi</jffi.bundle.symbolic.name>
-    <jffi.version>1.2.9</jffi.version>
+    <jffi.bundle.symbolic.name>com.github.jnr.jffi</jffi.bundle.symbolic.name>
+    <jffi.version>1.2.12</jffi.version>
 
     <jline.version>2.13</jline.version>
     <lucene.version>5.1.0_1</lucene.version>
@@ -709,27 +711,27 @@
     
       <!-- jnr-unixsocket and dependencies -->
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jnr-unixsocket</artifactId>
         <version>${jnr-unixsocket.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jnr-enxio</artifactId>
         <version>${jnr-enxio.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jnr-constants</artifactId>
         <version>${jnr-constants.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jnr-posix</artifactId>
         <version>${jnr-posix.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jnr-ffi</artifactId>
         <version>${jnr-ffi.version}</version>
       </dependency>
@@ -739,10 +741,16 @@
         <version>${jnr-x86asm.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.redhat.thermostat</groupId>
+        <groupId>com.github.jnr</groupId>
         <artifactId>jffi</artifactId>
         <version>${jffi.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.github.jnr</groupId>
+        <artifactId>jffi</artifactId>
+        <version>${jffi.version}</version>
+        <classifier>native</classifier>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>
--- a/vm-byteman/distribution/thermostat-plugin.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/vm-byteman/distribution/thermostat-plugin.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -122,8 +122,8 @@
                 <bundle><symbolic-name>com.redhat.thermostat.vm.byteman.agent</symbolic-name><version>${project.version}</version></bundle>
                 <bundle><symbolic-name>org.jboss.byteman.agent.install</symbolic-name><version>${byteman.osgi-version}</version></bundle>
                 <bundle><symbolic-name>org.jboss.byteman.agent.submit</symbolic-name><version>${byteman.osgi-version}</version></bundle>
-                <bundle><symbolic-name>${jnr-unixsocket.bundle.symbolic.name}</symbolic-name><version>${jnr-unixsocket.version}</version></bundle>
-                <bundle><symbolic-name>${jnr-enxio.bundle.symbolic.name}</symbolic-name><version>${jnr-enxio.version}</version></bundle>
+                <bundle><symbolic-name>${jnr-unixsocket.bundle.symbolic.name}</symbolic-name><version>${jnr-unixsocket.bundle.version}</version></bundle>
+                <bundle><symbolic-name>${jnr-enxio.bundle.symbolic.name}</symbolic-name><version>${jnr-enxio.bundle.version}</version></bundle>
                 <bundle><symbolic-name>${jnr-constants.bundle.symbolic.name}</symbolic-name><version>${jnr-constants.version}</version></bundle>
                 <bundle><symbolic-name>${jnr-posix.bundle.symbolic.name}</symbolic-name><version>${jnr-posix.version}</version></bundle>
                 <bundle><symbolic-name>${jnr-ffi.bundle.symbolic.name}</symbolic-name><version>${jnr-ffi.version}</version></bundle>
--- a/web/endpoint-plugin/distribution/thermostat-plugin.xml	Fri Aug 26 14:08:00 2016 -0400
+++ b/web/endpoint-plugin/distribution/thermostat-plugin.xml	Tue Aug 30 11:16:51 2016 -0400
@@ -83,8 +83,8 @@
         <bundle><symbolic-name>com.redhat.thermostat.agent.ipc.unixsocket.server</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.agent.ipc.common</symbolic-name><version>${project.version}</version></bundle>
         <bundle><symbolic-name>com.redhat.thermostat.agent.ipc.unixsocket.common</symbolic-name><version>${project.version}</version></bundle>
-        <bundle><symbolic-name>${jnr-unixsocket.bundle.symbolic.name}</symbolic-name><version>${jnr-unixsocket.version}</version></bundle>
-        <bundle><symbolic-name>${jnr-enxio.bundle.symbolic.name}</symbolic-name><version>${jnr-enxio.version}</version></bundle>
+        <bundle><symbolic-name>${jnr-unixsocket.bundle.symbolic.name}</symbolic-name><version>${jnr-unixsocket.bundle.version}</version></bundle>
+        <bundle><symbolic-name>${jnr-enxio.bundle.symbolic.name}</symbolic-name><version>${jnr-enxio.bundle.version}</version></bundle>
         <bundle><symbolic-name>${jnr-constants.bundle.symbolic.name}</symbolic-name><version>${jnr-constants.version}</version></bundle>
         <bundle><symbolic-name>${jnr-posix.bundle.symbolic.name}</symbolic-name><version>${jnr-posix.version}</version></bundle>
         <bundle><symbolic-name>${jnr-ffi.bundle.symbolic.name}</symbolic-name><version>${jnr-ffi.version}</version></bundle>