Mercurial > hg > thermostat-ng > agent

changeset 2440:4516a694428a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change byteman helper maven instructions for RPM build. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-September/020773.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Thu, 01 Sep 2016 12:35:46 +0200
parents cea7c676ac26
children 2adc9b0d86ec
files distribution/packaging/fedora/thermostat.spec vm-byteman/byteman-helper/pom.xml
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/packaging/fedora/thermostat.spec	Mon Aug 29 17:30:33 2016 +0200
+++ b/distribution/packaging/fedora/thermostat.spec	Thu Sep 01 12:35:46 2016 +0200
@@ -635,6 +635,11 @@
 %mvn_package com.redhat.thermostat:thermostat-distribution __noinstall
 %mvn_package com.redhat.thermostat:thermostat-assembly __noinstall
 
+# Install shaded classified artifact. The byteman-helper-distribution
+# build-only artifact has it as a dependency. Without this the xmvn
+# build fails.
+%mvn_package :thermostat-vm-byteman-helper::shaded:
+
 # thermostat-web-server and thermostat-web-endpoint should be part of
 # the webapp sub-package
 %mvn_package com.redhat.thermostat:thermostat-web-server webapp
--- a/vm-byteman/byteman-helper/pom.xml	Mon Aug 29 17:30:33 2016 +0200
+++ b/vm-byteman/byteman-helper/pom.xml	Thu Sep 01 12:35:46 2016 +0200
@@ -165,13 +165,13 @@
             </goals>
             <configuration>
               <!-- Skip inclusion of untransformed META-INF/services files. We use our own, relocated,
-                   versions included as resources. -->
+                   versions included as resources. Use maven-shade-plugin 2.0+ compatible syntax. -->
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                  <resources>
-                    <resource>com.redhat.thermostat.agent.ipc.client.internal.ClientTransportProvider</resource>
-                    <resource>com.redhat.thermostat.agent.ipc.common.internal.IPCPropertiesProvider</resource>
-                  </resources>
+                  <resource>com.redhat.thermostat.agent.ipc.client.internal.ClientTransportProvider</resource>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                  <resource>com.redhat.thermostat.agent.ipc.common.internal.IPCPropertiesProvider</resource>
                 </transformer>
               </transformers>
             </configuration>