packages/os-maven-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!10 Update to version 1.5.0

Browse Source 
From: @wang--ge 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2024-02-07 06:26:14 +00:00 committed by Gitee
commit 7c8f0a1739
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
0001-Port-to-current-plexus-utils.patch
View File

@ -1,17 +1,17 @@
From aa0c713f3b8363f4c7781ed5aec52ad0bf607508 Mon Sep 17 00:00:00 2001
From 83f6a375bc50df2565d3ac0329c8c4f2c2834f27 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 30 Mar 2015 15:40:16 +0200
Subject: [PATCH 1/2] Port to current plexus-utils
Date: Mon, 5 Feb 2024 15:28:57 +0800
Subject: [PATCH] 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
index e093a3f..3069b96 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 {
@@ -216,7 +216,7 @@ public class DetectExtension extends AbstractMavenLifecycleParticipant {
break;
}
@ -19,7 +19,7 @@ index 88c5e61..9ebe6dd 100644
+ InterpolationFilterReader reader = new InterpolationFilterReader(new StringReader(value), (Map)dict);
StringWriter writer = new StringWriter(value.length());
for (;;) {
int ch = 0;
int ch;
--
2.1.0
2.33.0

32
0001-add-loongarch64-support-for-os-maven-plugin.patch
View File

@ -1,6 +1,6 @@
From 82024c1b0006e2851713a3b0e78bf25aa81d64dd Mon Sep 17 00:00:00 2001
From 040a7b1eab99f49291c9b93432dfad36d6c338a2 Mon Sep 17 00:00:00 2001
From: Wenlong Zhang <zhangwenlong@loongson.cn>
Date: Thu, 9 Mar 2023 09:06:32 +0000
Date: Mon, 5 Feb 2024 15:11:27 +0800
Subject: [PATCH] add loongarch64 support for os-maven-plugin
---
@ -9,28 +9,28 @@ Subject: [PATCH] add loongarch64 support for os-maven-plugin
2 files changed, 4 insertions(+)
diff --git a/README.md b/README.md
index f05e7d2..14b1e6f 100644
index 8483a7d..a185b87 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@
* `aarch_64`
* `ppc_32`
* `ppc_64`
+ * `loongarch_64`
@@ -37,6 +37,7 @@
* `ppcle_64` - if the value is `ppc64le`
* `s390_32` - if the value is `s390`
* `s390_64` if the value is `s390x`
+* `loongarch_64` if the value is `loongarch_64`
You can also use the `${os.detected.classifier}` property, which is a shortcut of `${os.detected.name}-${os.detected.arch}`.
#### Property: `os.detected.version.*`
diff --git a/src/main/java/kr/motd/maven/os/Detector.java b/src/main/java/kr/motd/maven/os/Detector.java
index 9dd6688..202652f 100644
index 8962f51..2c48f8e 100644
--- a/src/main/java/kr/motd/maven/os/Detector.java
+++ b/src/main/java/kr/motd/maven/os/Detector.java
@@ -133,6 +133,9 @@ public abstract class Detector {
if (value.equals("ppc64")) {
return "ppc_64";
@@ -206,6 +206,9 @@ public abstract class Detector {
if ("s390x".equals(value)) {
return "s390_64";
}
+ if (value.equals("loongarch64")) {
+ return "loongarch_64";
+ }
+ if ("loongarch64".equals(value)) {
+ return "loongarch64";
+ }
return UNKNOWN;
}

25
0002-Don-t-fail-on-unknown-arch.patch
View File

@ -1,25 +0,0 @@
From b11d31e037120c3ee761276574f408005a78f632 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

39
0003-Add_support_for_RISC-V_arch.patch
View File

@ -1,26 +1,39 @@
From a7fef5b3abeb7da2a3ca847a38fb0c6f847b7d08 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Mon, 5 Feb 2024 15:19:50 +0800
Subject: [PATCH] Add_support_for_RISC-V_arch
---
README.md | 1 +
src/main/java/kr/motd/maven/os/Detector.java | 3 +++
2 files changed, 4 insertions(+)
diff --git a/README.md b/README.md
index f05e7d2..a84c834 100644
index 8483a7d..98f2c4e 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@
* `aarch_64`
* `ppc_32`
* `ppc_64`
+ * `riscv64`
@@ -37,6 +37,7 @@
* `ppcle_64` - if the value is `ppc64le`
* `s390_32` - if the value is `s390`
* `s390_64` if the value is `s390x`
+* `riscv64` if the value is `riscv64`
You can also use the `${os.detected.classifier}` property, which is a shortcut of `${os.detected.name}-${os.detected.arch}`.
#### Property: `os.detected.version.*`
diff --git a/src/main/java/kr/motd/maven/os/Detector.java b/src/main/java/kr/motd/maven/os/Detector.java
index 9dd6688..190144b 100644
index 8962f51..3c189ff 100644
--- a/src/main/java/kr/motd/maven/os/Detector.java
+++ b/src/main/java/kr/motd/maven/os/Detector.java
@@ -133,6 +133,9 @@ public abstract class Detector {
if (value.equals("ppc64")) {
return "ppc_64";
@@ -206,6 +206,9 @@ public abstract class Detector {
if ("s390x".equals(value)) {
return "s390_64";
}
+ if (value.equals("riscv64")) {
+ if ("riscv64".equals(value)) {
+ return "riscv64";
+ }
+ }
return UNKNOWN;
}
--
2.33.0

BIN
os-maven-plugin-1.2.3.Final.tar.gz
View File

Binary file not shown.

BIN
os-maven-plugin-1.5.0.Final.tar.gz Normal file
View File

Binary file not shown.

12
os-maven-plugin.spec
View File

@ -1,13 +1,13 @@
%global vertag Final
Name: os-maven-plugin
Version: 1.2.3
Release: 3
version: 1.5.0
Release: 1
Summary: Maven plugin for generating platform-dependent properties
License: ASL 2.0
URL: https://github.com/trustin/os-maven-plugin/
BuildArch: noarch
Source0: https://github.com/trustin/%{name}/archive/%{name}-%{version}.Final.tar.gz
Source0: https://github.com/trustin/%{name}/archive/refs/tags/%{name}-%{version}.Final.tar.gz
Patch0: 0001-Port-to-current-plexus-utils.patch
Patch1: 0001-add-loongarch64-support-for-os-maven-plugin.patch
@ -19,6 +19,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils) mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
%description
os-maven-plugin is a Maven extension/plugin that generates various
@ -49,6 +50,8 @@ This package provides %{summary}.
# Remove Eclipse plugin (not needed in Fedora)
%pom_remove_dep org.eclipse:ui
%pom_remove_plugin :maven-jar-plugin
%pom_remove_plugin org.codehaus.mojo:animal-sniffer-maven-plugin
%pom_add_dep com.google.code.findbugs:jsr305:3.0.2
find -name EclipseStartup.java -delete
find -name plugin.xml -delete
@ -67,6 +70,9 @@ find -name plugin.xml -delete
%doc LICENSE.txt
%changelog
* Mon Feb 05 2024 Ge Wang <wang__ge@126.com> - 1.5.0-1
- Update to version 1.5.0
* Mon Jun 26 2023 xiaoqian lv <xiaoqian@nj.iscas.ac.cn> - 1.2.3-3
- Add support for RISC-V arch