Mercurial > hg > thermostat-ng > agent
changeset 2442:7228aa5e2103
[RPM] Edit jnr-x86asm groupId in dependencyManagement
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-September/020804.html
| author | Elliott Baron <ebaron@redhat.com> |
|---|---|
| date | Wed, 07 Sep 2016 17:57:58 -0400 |
| parents | 2adc9b0d86ec |
| children | 7d425e87140c |
| files | distribution/packaging/fedora/thermostat.spec |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/packaging/fedora/thermostat.spec Wed Sep 07 17:57:26 2016 -0400 +++ b/distribution/packaging/fedora/thermostat.spec Wed Sep 07 17:57:58 2016 -0400 @@ -560,9 +560,12 @@ # need jline 2.13 (otherwise this resolves to jline 1) %pom_xpath_remove "pom:properties/pom:jline.version" %pom_xpath_inject "pom:properties" "<jline.version>%{jline_version}</jline.version>" -# Don't use bundle-wrapped jnr-unixsocket and deps +# Don't use bundle-wrapped jnr-x86asm %pom_disable_module jnr-wrapped agent/ipc/unix-socket %pom_remove_dep com.redhat.thermostat:jnr-x86asm distribution +# Replace our groupId for jnr-x86asm with upstream groupId +%pom_xpath_replace "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId[text()='jnr-x86asm']]/pom:groupId" \ + "<groupId>com.github.jnr</groupId>" # 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.