commit os-maven-plugin for openSUSE:Factory

Hello community, here is the log from the commit of package os-maven-plugin for openSUSE:Factory checked in at 2019-11-13 13:28:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-maven-plugin (Old) and /work/SRC/openSUSE:Factory/.os-maven-plugin.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-maven-plugin" Wed Nov 13 13:28:44 2019 rev:1 rq:747926 version:1.2.3 Changes: -------- New Changes file: --- /dev/null 2019-10-24 10:19:07.066239389 +0200 +++ /work/SRC/openSUSE:Factory/.os-maven-plugin.new.2990/os-maven-plugin.changes 2019-11-13 13:28:44.739723860 +0100 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Nov 12 20:33:06 UTC 2019 - Fridrich Strba + +- Initial packaging of os-maven-plugin 1.2.3 New: ---- 0001-Port-to-current-plexus-utils.patch 0002-Don-t-fail-on-unknown-arch.patch os-maven-plugin-1.2.3.Final.tar.gz os-maven-plugin.changes os-maven-plugin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-maven-plugin.spec ++++++ # # spec file for package os-maven-plugin # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global vertag Final Name: os-maven-plugin Version: 1.2.3 Release: 0 Summary: Maven plugin for generating platform-dependent properties License: Apache-2.0 URL: https://github.com/trustin/os-maven-plugin/ 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: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildArch: noarch %description os-maven-plugin is a Maven extension/plugin that generates various useful platform-dependent project properties normalized from ${os.name} and ${os.arch}. ${os.name} and ${os.arch} are often subtly different between JVM and operating system versions or they sometimes contain machine-unfriendly characters such as whitespaces. This plugin tries to remove such fragmentation so that you can determine the current operating system and architecture reliably. %package javadoc Summary: API documentation for %{name} %description javadoc This package provides %{summary}. %prep %setup -q -n %{name}-%{name}-%{version}.%{vertag} %patch0 -p1 %patch1 -p1 # Remove Eclipse plugin %pom_remove_dep org.eclipse:ui %pom_remove_plugin :maven-jar-plugin find -name EclipseStartup.java -delete find -name plugin.xml -delete %build %{mvn_build} -f -- -Dsource=6 %install %mvn_install %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %dir %{_javadir}/%{name} %dir %{_mavenpomdir}/%{name} %license LICENSE.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog ++++++ 0001-Port-to-current-plexus-utils.patch ++++++

From aa0c713f3b8363f4c7781ed5aec52ad0bf607508 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 Mar 2015 15:40:16 +0200 Subject: [PATCH 1/2] Port to current plexus-utils

--- src/main/java/kr/motd/maven/os/DetectExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kr/motd/maven/os/DetectExtension.java b/src/main/java/kr/motd/maven/os/DetectExtension.java index 88c5e61..9ebe6dd 100644 --- a/src/main/java/kr/motd/maven/os/DetectExtension.java +++ b/src/main/java/kr/motd/maven/os/DetectExtension.java @@ -180,7 +180,7 @@ public class DetectExtension extends AbstractMavenLifecycleParticipant { break; } - InterpolationFilterReader reader = new InterpolationFilterReader(new StringReader(value), dict); + InterpolationFilterReader reader = new InterpolationFilterReader(new StringReader(value), (Map)dict); StringWriter writer = new StringWriter(value.length()); for (;;) { int ch = 0; -- 2.1.0 ++++++ 0002-Don-t-fail-on-unknown-arch.patch ++++++

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