From f955a8c3d3337a62da1c582daef97d7a23aa39f8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jul 15 2015 16:41:37 +0000 Subject: Don't fail on unknown arch --- diff --git a/0001-Port-to-current-plexus-utils.patch b/0001-Port-to-current-plexus-utils.patch index cfb33b7..3e8e3bc 100644 --- a/0001-Port-to-current-plexus-utils.patch +++ b/0001-Port-to-current-plexus-utils.patch @@ -1,7 +1,7 @@ -From 7d45d9ad8717f8e94c2497f85adc54d4d5f16ba4 Mon Sep 17 00:00:00 2001 +From aa0c713f3b8363f4c7781ed5aec52ad0bf607508 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 Mar 2015 15:40:16 +0200 -Subject: [PATCH] Port to current plexus-utils +Subject: [PATCH 1/2] Port to current plexus-utils --- src/main/java/kr/motd/maven/os/DetectExtension.java | 2 +- diff --git a/0002-Don-t-fail-on-unknown-arch.patch b/0002-Don-t-fail-on-unknown-arch.patch new file mode 100644 index 0000000..ad45e41 --- /dev/null +++ b/0002-Don-t-fail-on-unknown-arch.patch @@ -0,0 +1,25 @@ +From b11d31e037120c3ee761276574f408005a78f632 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 15 Jul 2015 18:39:46 +0200 +Subject: [PATCH 2/2] Don't fail on unknown arch + +--- + src/main/java/kr/motd/maven/os/Detector.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/kr/motd/maven/os/Detector.java b/src/main/java/kr/motd/maven/os/Detector.java +index 9dd6688..37ced72 100644 +--- a/src/main/java/kr/motd/maven/os/Detector.java ++++ b/src/main/java/kr/motd/maven/os/Detector.java +@@ -46,7 +46,7 @@ public abstract class Detector { + setProperty(props, DETECTED_CLASSIFIER, detectedClassifier); + + final String failOnUnknownOS = allProps.getProperty("failOnUnknownOS"); +- if (failOnUnknownOS == null || !failOnUnknownOS.equalsIgnoreCase("false")) { ++ if (failOnUnknownOS != null && failOnUnknownOS.equalsIgnoreCase("true")) { + if (UNKNOWN.equals(detectedName)) { + throw new DetectionException("unknown os.name: " + osName); + } +-- +2.1.0 + diff --git a/os-maven-plugin.spec b/os-maven-plugin.spec index e7134ae..7b88ad5 100644 --- a/os-maven-plugin.spec +++ b/os-maven-plugin.spec @@ -2,7 +2,7 @@ Name: os-maven-plugin Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven plugin for generating platform-dependent properties License: ASL 2.0 URL: https://github.com/trustin/os-maven-plugin/ @@ -11,6 +11,7 @@ BuildArch: noarch Source0: https://github.com/trustin/%{name}/archive/%{name}-%{version}.Final.tar.gz Patch0: 0001-Port-to-current-plexus-utils.patch +Patch1: 0002-Don-t-fail-on-unknown-arch.patch BuildRequires: maven-local BuildRequires: maven-shared @@ -37,6 +38,7 @@ This package provides %{summary}. %setup -q -n %{name}-%{name}-%{version}.%{vertag} %patch0 -p1 +%patch1 -p1 # Remove Eclipse plugin (not needed in Fedora) %pom_remove_dep org.eclipse:ui @@ -59,6 +61,9 @@ find -name plugin.xml -delete %doc LICENSE.txt %changelog +* Wed Jul 15 2015 Mikolaj Izdebski - 1.2.3-4 +- Don't fail on unknown arch + * Thu Jun 18 2015 Fedora Release Engineering - 1.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild