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 23:09:20 UTC
[felix-dev] branch connect updated (a8d4e66 -> 861635c)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch connect
in repository https://gitbox.apache.org/repos/asf/felix-dev.git.
from a8d4e66 Clean-up some imports
new f1cad2b FELIX-6222: Support for os.name Capability is missing for Windows Server 2019
new 861635c Update changelog
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
framework/doc/changelog.txt | 11 +++++++++++
.../framework/util/manifestparser/NativeLibraryClause.java | 5 +++++
framework/src/main/resources/default.properties | 1 +
3 files changed, 17 insertions(+)
[felix-dev] 01/02: FELIX-6222: Support for os.name Capability is
missing for Windows Server 2019
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch connect
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit f1cad2b9b254435095542ad821af46f2323946b7
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 a46c5f3..792bfdb 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, \
[felix-dev] 02/02: Update changelog
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch connect
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 861635cf79e1be1379c8127b47287ee9b947adea
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Fri Dec 11 22:17:45 2020 +0100
Update changelog
---
framework/doc/changelog.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index 4da82c6..c7aeaac 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -1,3 +1,14 @@
+Changes from 6.0.3 to 6.0.4
+---------------------------
+
+** Bug
+ * [FELIX-6178] - org.osgi.framework.Bundle#getServicesInUse returns services with usage count = 0
+ * [FELIX-6222] - Support for os.name Capability is missing for Windows Server 2019
+ * [FELIX-6297] - unclosed InputStream on Bundle.start
+ * [FELIX-6318] - Tiny thread-safety bug in BundleWiringImpl
+ * [FELIX-6326] - Cannot read bundled resources with hash in the filename
+ * [FELIX-6331] - Race condition in unget service from service factory
+
Changes from 6.0.2 to 6.0.3
---------------------------