[maven-hpi-plugin] Update to upstream version 1.108

Michal Srb msrb at fedoraproject.org
Wed May 7 08:31:08 UTC 2014


commit 4ecda16830fb76acc8b31d1c323529e2b6ad2c8e
Author: Michal Srb <msrb at redhat.com>
Date:   Wed May 7 10:31:14 2014 +0200

    Update to upstream version 1.108

 .gitignore            |    1 +
 maven-hpi-plugin.spec |   23 ++++++++++++++++++-----
 sources               |    2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e12f919..3c77839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /maven-hpi-plugin-1.99.tar.gz
 /maven-hpi-plugin-1.100.tar.gz
 /maven-hpi-plugin-1.106.tar.gz
+/maven-hpi-plugin-1.108.tar.gz
diff --git a/maven-hpi-plugin.spec b/maven-hpi-plugin.spec
index d2c555d..7578736 100644
--- a/maven-hpi-plugin.spec
+++ b/maven-hpi-plugin.spec
@@ -1,5 +1,5 @@
 Name:           maven-hpi-plugin
-Version:        1.106
+Version:        1.108
 Release:        1%{?dist}
 Summary:        Maven plugin to build Jenkins plugins
 
@@ -26,20 +26,25 @@ Patch1:         0001-Unbundle-org.jenkins-ci-version-number.patch
 BuildArch:      noarch
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(com.ibm.icu:icu4j)
 BuildRequires:  mvn(com.sun.codemodel:codemodel)
+BuildRequires:  mvn(jakarta-regexp:jakarta-regexp)
 BuildRequires:  mvn(net.java.sezpoz:sezpoz)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-archetype-plugin)
+BuildRequires:  mvn(org.apache.ant:ant-apache-regexp)
 BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-archetype-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-interactivity-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.jenkins-ci:version-number)
 BuildRequires:  mvn(org.kohsuke.stapler:stapler-groovy)
-BuildRequires:  ant-apache-regexp
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  icu4j
 
 
 %description
@@ -73,6 +78,8 @@ rm ./src/main/java/org/jenkinsci/maven/plugins/hpi/VersionNumber.java
 # Nothing really interesting in parent
 %pom_remove_parent
 
+# missing extension
+%pom_xpath_remove "pom:extensions/pom:extension[pom:artifactId[text()='wagon-ssh']]"
 
 # Remove "run" mojo, it requires jetty 6
 rm src/main/java/org/jenkinsci/maven/plugins/hpi/ServletApiOnlyClassLoader.java
@@ -80,6 +87,9 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJetty6Mojo.java
 rm src/main/java/org/jenkinsci/maven/plugins/hpi/AbstractJettyMojo.java
 rm src/main/java/org/jenkinsci/maven/plugins/hpi/RunMojo.java
 rm src/main/java/org/jenkinsci/maven/plugins/hpi/ConsoleScanner.java
+# WarMojo depends on RunMojo
+rm src/main/java/org/jenkinsci/maven/plugins/hpi/WarMojo.java
+
 %pom_remove_dep :maven-jetty-plugin
 %pom_remove_dep :maven-stapler-plugin
 
@@ -102,6 +112,9 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/CreateMojo.java
 
 
 %changelog
+* Wed May 07 2014 Michal Srb <msrb at redhat.com> - 1.108-1
+- Update to upstream version 1.108
+
 * Wed Nov 06 2013 Michal Srb <msrb at redhat.com> - 1.106-1
 - Update to upstream version 1.106
 
diff --git a/sources b/sources
index 3cc8805..f8122e5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
 0f3abd1e8ab49fa980c02e7b8e543fc3  LICENSE-MIT.txt
-a7b116e93704814aa6618c31d13eeaba  maven-hpi-plugin-1.106.tar.gz
+e92ce7fe53cd464562d76017e68590da  maven-hpi-plugin-1.108.tar.gz


More information about the scm-commits mailing list