Mercurial > hg > thermostat-ng > agent

changeset 2700:4d45a6637faa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Windows/macOS builds The distribution/assembly/core-aseembly-*.xml files haven't been updated properly as system requirements change. If a portable module is required by core-assembly.xml, it should be added to the other platforms, too, otherwise the build will break. Even if this cannot be tested by the developer (if they develop in Linux), it's usually a pretty safe bet. This patch fixes the Windows (and presumably the macOS) build. Reviewed-by: sgehwolf, neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-June/023840.html
author Simon Tooke <stooke@redhat.com>
date Wed, 21 Jun 2017 06:33:05 -0400
parents 82eec2e341a0
children 23ccc7c79110
files distribution/assembly/core-assembly-macosx.xml distribution/assembly/core-assembly-windows.xml
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/assembly/core-assembly-macosx.xml	Thu Jun 22 14:18:56 2017 +0200
+++ b/distribution/assembly/core-assembly-macosx.xml	Wed Jun 21 06:33:05 2017 -0400
@@ -61,16 +61,19 @@
         <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-server</include>
         <include>com.redhat.thermostat:thermostat-agent-ipc-unixsocket-client</include>
         <include>com.redhat.thermostat:thermostat-common-core</include>
-        <include>com.redhat.thermostat:thermostat-common-command</include>
         <include>com.redhat.thermostat:thermostat-common-portability</include>
         <include>com.redhat.thermostat:thermostat-process-handler</include>
         <include>com.redhat.thermostat:thermostat-storage-core</include>
         <include>com.redhat.thermostat:thermostat-system-backend</include>
         <include>org.osgi:org.osgi.compendium</include>
         <include>org.apache:org.apache.felix.scr</include>
-        <include>io.netty:netty-handler</include>
         <include>commons-codec:commons-codec</include>
         <include>org.apache.httpcomponents:httpclient-osgi</include>
+        <include>org.eclipse.jetty:jetty-client</include>
+        <include>org.eclipse.jetty:jetty-http</include>
+        <include>org.eclipse.jetty:jetty-io</include>
+        <include>org.eclipse.jetty:jetty-util</include>
+        <include>javax.servlet:javax.servlet-api</include>
         <!-- Remove once upstream has OSGi metadata -->
         <include>com.redhat.thermostat:jnr-x86asm</include>
       </includes>
--- a/distribution/assembly/core-assembly-windows.xml	Thu Jun 22 14:18:56 2017 +0200
+++ b/distribution/assembly/core-assembly-windows.xml	Wed Jun 21 06:33:05 2017 -0400
@@ -61,16 +61,19 @@
         <include>com.redhat.thermostat:thermostat-agent-ipc-winpipes-server</include>
         <include>com.redhat.thermostat:thermostat-agent-ipc-winpipes-client</include>
         <include>com.redhat.thermostat:thermostat-common-core</include>
-        <include>com.redhat.thermostat:thermostat-common-command</include>
         <include>com.redhat.thermostat:thermostat-common-portability</include>
         <include>com.redhat.thermostat:thermostat-process-handler</include>
         <include>com.redhat.thermostat:thermostat-storage-core</include>
         <include>com.redhat.thermostat:thermostat-system-backend</include>
         <include>org.osgi:org.osgi.compendium</include>
         <include>org.apache:org.apache.felix.scr</include>
-        <include>io.netty:netty-handler</include>
         <include>commons-codec:commons-codec</include>
         <include>org.apache.httpcomponents:httpclient-osgi</include>
+        <include>org.eclipse.jetty:jetty-client</include>
+        <include>org.eclipse.jetty:jetty-http</include>
+        <include>org.eclipse.jetty:jetty-io</include>
+        <include>org.eclipse.jetty:jetty-util</include>
+        <include>javax.servlet:javax.servlet-api</include>
       </includes>
       <excludes>
         <exclude>org.osgi:org.osgi.core</exclude>