You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2020/12/11 20:59:26 UTC
[felix-dev] branch master updated: FELIX-6222: Support for os.name
Capability is missing for Windows Server 2019
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 6499084 FELIX-6222: Support for os.name Capability is missing for Windows Server 2019
6499084 is described below
commit 6499084afaf27abe76d5a82dfac7d3af1b281b33
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Fri Dec 11 21:59:07 2020 +0100
FELIX-6222: Support for os.name Capability is missing for Windows Server 2019
---
.../felix/framework/util/manifestparser/NativeLibraryClause.java | 5 +++++
framework/src/main/resources/default.properties | 1 +
2 files changed, 6 insertions(+)
diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
index 69e7155..bd4edf0 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
@@ -72,6 +72,7 @@ public class NativeLibraryClause
private static final String OS_WINDOWS_SERVER_2008 = "windowsserver2008";
private static final String OS_WINDOWS_SERVER_2012 = "windowsserver2012";
private static final String OS_WINDOWS_SERVER_2016 = "windowsserver2016";
+ private static final String OS_WINDOWS_SERVER_2019 = "windowsserver2019";
private static final String OS_WINDOWS_VISTA = "windowsvista";
private static final String OS_WINDOWS_XP = "windowsxp";
private static final String OS_WIN_32 = "win32";
@@ -579,6 +580,10 @@ public class NativeLibraryClause
{
os = OS_WINDOWS_SERVER_2016;
}
+ else if (value.indexOf("2019") >= 0)
+ {
+ os = OS_WINDOWS_SERVER_2019;
+ }
else if (value.indexOf("xp") >= 0)
{
os = OS_WINDOWS_XP;
diff --git a/framework/src/main/resources/default.properties b/framework/src/main/resources/default.properties
index f6b4821..d66362f 100644
--- a/framework/src/main/resources/default.properties
+++ b/framework/src/main/resources/default.properties
@@ -69,6 +69,7 @@ felix.native.osname.alias.windows10=windows 10,win32
felix.native.osname.alias.windowsserver2008=windows server 2008,win32
felix.native.osname.alias.windowsserver2012=windows server 2012,win32
felix.native.osname.alias.windowsserver2016=windows server 2016,win32
+felix.native.osname.alias.windowsserver2019=windows server 2019,win32
felix.native.osname.alias.win32=
felix.service.caps=osgi.service; objectClass:List<String>=org.osgi.service.resolver.Resolver; uses:=org.osgi.service.resolver, \