msrb pushed to jenkins-matrix-project-plugin (master). "Update to upstream version 1.4.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 13:23:47 UTC 2015


>From f9f99b8683b1ce9e24b9ad54a8da8e2ee61049d3 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Tue, 31 Mar 2015 17:13:14 +0200
Subject: Update to upstream version 1.4.1


diff --git a/.gitignore b/.gitignore
index 5096990..596cac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /LICENSE.txt
 /matrix-project-1.3.tar.gz
 /matrix-project-1.4.tar.gz
+/matrix-project-1.4.1.tar.gz
diff --git a/jenkins-matrix-project-plugin.spec b/jenkins-matrix-project-plugin.spec
index 922e2fc..11648d8 100644
--- a/jenkins-matrix-project-plugin.spec
+++ b/jenkins-matrix-project-plugin.spec
@@ -3,7 +3,7 @@
 %global plugin_home %{_datadir}/jenkins/webroot/WEB-INF/plugins/%{short_name}.jpi
 
 Name:           jenkins-%{mod_name}
-Version:        1.4
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        Jenkins Matrix Project Plugin
 
@@ -19,6 +19,7 @@ BuildRequires:  mvn(org.jenkins-ci.plugins:plugin:pom:)
 BuildRequires:  mvn(org.kohsuke:access-modifier-checker)
 BuildRequires:  mvn(org.jenkins-ci.main:jenkins-core)
 BuildRequires:  mvn(org.jenkins-ci.plugins:junit)
+BuildRequires:  mvn(org.jenkins-ci.plugins:script-security)
 Requires:       jenkins-webapp
 
 BuildArch:      noarch
@@ -47,10 +48,10 @@ cp %{SOURCE1} .
 # tests have special needs:
 # "package hudson.tasks.junit does not exist"
 # we don't have these Jenkins test artifacts in Fedora
-%mvn_build -f
+%mvn_build -f -- -DdisabledTestDepPluginsResolution=true -Dmaven-hpi-plugin.disabledTestInjection=true
 
 %install
-# unpack hpi file into the correct location
+# unpack hpi file to the correct location
 install -d -m 755 %{buildroot}/%{plugin_home}
 unzip -d %{buildroot}/%{plugin_home} target/%{short_name}.hpi
 rm %{buildroot}/%{plugin_home}/WEB-INF/lib/*
@@ -67,6 +68,9 @@ sed -i 's|%{plugin_home}/WEB-INF/lib/%{short_name}.jar||' .mfiles
 %doc LICENSE.txt
 
 %changelog
+* Tue Mar 31 2015 Michal Srb <msrb at redhat.com> - 1.4.1-1
+- Update to upstream version 1.4.1
+
 * Fri Nov 21 2014 Michal Srb <msrb at redhat.com> - 1.4-1
 - Update to upstream version 1.4
 
diff --git a/sources b/sources
index 851cda0..5348a19 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b28808853537299bae3b2025e2c38d89  LICENSE.txt
-e701e9bacd6fdf6949500084e3be3f5d  matrix-project-1.4.tar.gz
+880dd0dcd8283ae75c160eb03b185fca  matrix-project-1.4.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jenkins-matrix-project-plugin.git/commit/?h=master&id=f9f99b8683b1ce9e24b9ad54a8da8e2ee61049d3


More information about the scm-commits mailing list