This is an automated email from the ASF dual-hosted git repository.
jhorvath 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 61b9e1a47b Slf4j library upgrade (#5821)
61b9e1a47b is described below
commit 61b9e1a47bd8c0aca4c6df9526606a5f30bc05ee
Author: Tomas Hurka <[email protected]>
AuthorDate: Mon Apr 17 09:26:34 2023 +0200
Slf4j library upgrade (#5821)
* upgrade of slf4j library to 1.7.36
* overlap with apache-maven-3.9.1-bin.zip ignored
---
ide/slf4j.api/external/binaries-list | 2 +-
.../external/slf4j-api-1.7.36-license.txt} | 2 +-
ide/slf4j.api/nbproject/project.properties | 2 +-
ide/slf4j.api/nbproject/project.xml | 2 +-
ide/slf4j.jdk14/external/binaries-list | 2 +-
.../external/slf4j-jdk14-1.7.36-license.txt} | 2 +-
ide/slf4j.jdk14/nbproject/project.properties | 2 +-
ide/slf4j.jdk14/nbproject/project.xml | 2 +-
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 ++--
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ide/slf4j.api/external/binaries-list
b/ide/slf4j.api/external/binaries-list
index 46be4cb5f6..600bf489d2 100644
--- a/ide/slf4j.api/external/binaries-list
+++ b/ide/slf4j.api/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-2CD9B264F76E3D087EE21BFC99305928E1BDB443 org.slf4j:slf4j-api:1.7.28
\ No newline at end of file
+6C62681A2F655B49963A5983B8B0950A6120AE14 org.slf4j:slf4j-api:1.7.36
\ No newline at end of file
diff --git a/ide/slf4j.jdk14/external/slf4j-jdk14-1.7.28-license.txt
b/ide/slf4j.api/external/slf4j-api-1.7.36-license.txt
similarity index 98%
rename from ide/slf4j.jdk14/external/slf4j-jdk14-1.7.28-license.txt
rename to ide/slf4j.api/external/slf4j-api-1.7.36-license.txt
index 796026acfc..ea4879e7c5 100644
--- a/ide/slf4j.jdk14/external/slf4j-jdk14-1.7.28-license.txt
+++ b/ide/slf4j.api/external/slf4j-api-1.7.36-license.txt
@@ -1,5 +1,5 @@
Name: SLF4J
-Version: 1.7.28
+Version: 1.7.36
License: MIT-slf4j
Origin: https://www.slf4j.org/
Description: Simple Logging Facade for Java (SLF4J).
diff --git a/ide/slf4j.api/nbproject/project.properties
b/ide/slf4j.api/nbproject/project.properties
index a2e73e2c41..11a94b29cb 100644
--- a/ide/slf4j.api/nbproject/project.properties
+++ b/ide/slf4j.api/nbproject/project.properties
@@ -16,5 +16,5 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-release.external/slf4j-api-1.7.28.jar=modules/slf4j-api.jar
+release.external/slf4j-api-1.7.36.jar=modules/slf4j-api.jar
is.autoload=true
diff --git a/ide/slf4j.api/nbproject/project.xml
b/ide/slf4j.api/nbproject/project.xml
index 342d20a0d1..d6ab7089b6 100644
--- a/ide/slf4j.api/nbproject/project.xml
+++ b/ide/slf4j.api/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>slf4j-api.jar</runtime-relative-path>
- <binary-origin>external/slf4j-api-1.7.28.jar</binary-origin>
+ <binary-origin>external/slf4j-api-1.7.36.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/ide/slf4j.jdk14/external/binaries-list
b/ide/slf4j.jdk14/external/binaries-list
index 9ec68ed7f3..2b92522d79 100644
--- a/ide/slf4j.jdk14/external/binaries-list
+++ b/ide/slf4j.jdk14/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-7DD18B408288AD35CD4021A6E50F0E6E8C6454DE org.slf4j:slf4j-jdk14:1.7.28
+4A18AF6554BFE48B0F76EEC98119C417DA23C7E1 org.slf4j:slf4j-jdk14:1.7.36
diff --git a/ide/slf4j.api/external/slf4j-api-1.7.28-license.txt
b/ide/slf4j.jdk14/external/slf4j-jdk14-1.7.36-license.txt
similarity index 98%
rename from ide/slf4j.api/external/slf4j-api-1.7.28-license.txt
rename to ide/slf4j.jdk14/external/slf4j-jdk14-1.7.36-license.txt
index 796026acfc..ea4879e7c5 100644
--- a/ide/slf4j.api/external/slf4j-api-1.7.28-license.txt
+++ b/ide/slf4j.jdk14/external/slf4j-jdk14-1.7.36-license.txt
@@ -1,5 +1,5 @@
Name: SLF4J
-Version: 1.7.28
+Version: 1.7.36
License: MIT-slf4j
Origin: https://www.slf4j.org/
Description: Simple Logging Facade for Java (SLF4J).
diff --git a/ide/slf4j.jdk14/nbproject/project.properties
b/ide/slf4j.jdk14/nbproject/project.properties
index 1bd8d3970d..03964d1063 100644
--- a/ide/slf4j.jdk14/nbproject/project.properties
+++ b/ide/slf4j.jdk14/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/slf4j-jdk14-1.7.28.jar=modules/slf4j-jdk14.jar
+release.external/slf4j-jdk14-1.7.36.jar=modules/slf4j-jdk14.jar
is.autoload=true
diff --git a/ide/slf4j.jdk14/nbproject/project.xml
b/ide/slf4j.jdk14/nbproject/project.xml
index 46fdc5613b..976d97b30b 100644
--- a/ide/slf4j.jdk14/nbproject/project.xml
+++ b/ide/slf4j.jdk14/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>slf4j-jdk14.jar</runtime-relative-path>
- <binary-origin>external/slf4j-jdk14-1.7.28.jar</binary-origin>
+ <binary-origin>external/slf4j-jdk14-1.7.36.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 279598545c..9bb4de6063 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -26,9 +26,9 @@ apisupport.feedreader/external/jdom-1.0.jar
mobility.deployment.webdav/external/
# db.sql.visualeditor/external/javacc-7.0.10.jar is used at compile-time only
ide/db.sql.visualeditor/external/javacc-7.0.10.jar
java/performance/external/javacc-7.0.10.jar
-# It happens that maven 3.3.9 uses commons-lang-2.6.jar, same as
o.apache.commons.lang
-# and commons-io-2.5.jar, same as java.lsp.server
+# It happens that maven 3.9.1 uses slf4j-api-1.7.36.jar, same as slf4j.api
# These are used independently, different functional goals
+ide/slf4j.api/external/slf4j-api-1.7.36.jar
java/maven.embedder/external/apache-maven-3.9.1-bin.zip
# Contains test data (badPackageFileInJar.jar is packaged twice) - this is an
# upstream problem
---------------------------------------------------------------------
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
