This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 12b4d69 Updating to Apache Felix 6.0.3
new 3c16c96 Merge pull request #1631 from pepness/felix603
12b4d69 is described below
commit 12b4d694b1b14d269992391b655e35a4cfc3fd06
Author: Jose Contreras <[email protected]>
AuthorDate: Mon Nov 11 16:47:42 2019 -0600
Updating to Apache Felix 6.0.3
---
platform/libs.felix/external/binaries-list | 2 +-
...main-6.0.2-license.txt => org.apache.felix.main-6.0.3-license.txt} | 4 ++--
...x.main-6.0.2-notice.txt => org.apache.felix.main-6.0.3-notice.txt} | 0
platform/libs.felix/nbproject/project.properties | 4 ++--
platform/libs.felix/nbproject/project.xml | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/platform/libs.felix/external/binaries-list
b/platform/libs.felix/external/binaries-list
index 24bd362..0fd0c8b 100644
--- a/platform/libs.felix/external/binaries-list
+++ b/platform/libs.felix/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-1EA2666BB8C3F72A4A30843490F19431ABAD73CC
org.apache.felix:org.apache.felix.main:6.0.2
+9A6CBBA44A72BB04411EDF8B154C862E27209E8A
org.apache.felix:org.apache.felix.main:6.0.3
diff --git
a/platform/libs.felix/external/org.apache.felix.main-6.0.2-license.txt
b/platform/libs.felix/external/org.apache.felix.main-6.0.3-license.txt
similarity index 99%
rename from platform/libs.felix/external/org.apache.felix.main-6.0.2-license.txt
rename to platform/libs.felix/external/org.apache.felix.main-6.0.3-license.txt
index f6f9e45..68a6f84 100644
--- a/platform/libs.felix/external/org.apache.felix.main-6.0.2-license.txt
+++ b/platform/libs.felix/external/org.apache.felix.main-6.0.3-license.txt
@@ -1,8 +1,8 @@
Name: Felix
-Version: 6.0.2
+Version: 6.0.3
Description: Apache Felix OSGi container.
License: Apache-2.0
-Files: org.apache.felix.main-6.0.2.jar
+Files: org.apache.felix.main-6.0.3.jar
Origin: Apache Software Foundation
URL: http://archive.apache.org/dist/felix/
diff --git
a/platform/libs.felix/external/org.apache.felix.main-6.0.2-notice.txt
b/platform/libs.felix/external/org.apache.felix.main-6.0.3-notice.txt
similarity index 100%
rename from platform/libs.felix/external/org.apache.felix.main-6.0.2-notice.txt
rename to platform/libs.felix/external/org.apache.felix.main-6.0.3-notice.txt
diff --git a/platform/libs.felix/nbproject/project.properties
b/platform/libs.felix/nbproject/project.properties
index 97197d7..48a6700 100644
--- a/platform/libs.felix/nbproject/project.properties
+++ b/platform/libs.felix/nbproject/project.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-release.external/org.apache.felix.main-6.0.2.jar=modules/ext/org.apache.felix.main-6.0.2.jar
-javac.source=1.6
+release.external/org.apache.felix.main-6.0.3.jar=modules/ext/org.apache.felix.main-6.0.3.jar
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/platform/libs.felix/nbproject/project.xml
b/platform/libs.felix/nbproject/project.xml
index 8015d33..1078aaf 100644
--- a/platform/libs.felix/nbproject/project.xml
+++ b/platform/libs.felix/nbproject/project.xml
@@ -36,8 +36,8 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/org.apache.felix.main-6.0.2.jar</runtime-relative-path>
-
<binary-origin>external/org.apache.felix.main-6.0.2.jar</binary-origin>
+
<runtime-relative-path>ext/org.apache.felix.main-6.0.3.jar</runtime-relative-path>
+
<binary-origin>external/org.apache.felix.main-6.0.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
