You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/12/12 20:14:40 UTC
[netbeans] branch master updated: Upgrade Apache Commons-Logging
from 1.1.1 to 1.2
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 21691f5 Upgrade Apache Commons-Logging from 1.1.1 to 1.2
21691f5 is described below
commit 21691f5cbf6896fbd62fb604228f9caa62acb388
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Wed Dec 4 21:38:29 2019 -0600
Upgrade Apache Commons-Logging from 1.1.1 to 1.2
Closes: #1743
---
platform/o.apache.commons.logging/build.xml | 8 ++++----
platform/o.apache.commons.logging/external/binaries-list | 2 +-
...-logging-1.1.1-license.txt => commons-logging-1.2-license.txt} | 4 ++--
...ns-logging-1.1.1-notice.txt => commons-logging-1.2-notice.txt} | 0
platform/o.apache.commons.logging/manifest.mf | 1 +
platform/o.apache.commons.logging/nbproject/project.properties | 2 ++
platform/o.apache.commons.logging/nbproject/project.xml | 2 +-
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/platform/o.apache.commons.logging/build.xml b/platform/o.apache.commons.logging/build.xml
index ae93fd5..349a209 100644
--- a/platform/o.apache.commons.logging/build.xml
+++ b/platform/o.apache.commons.logging/build.xml
@@ -22,13 +22,13 @@
<project name="platform/o.apache.commons.logging" default="build" basedir=".">
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="jar" depends="-define-FileCRC32Calculator">
- <FileCRC32Calculator file="external/commons-logging-1.1.1.jar" property="o.apache.commons.logging.crc32" />
+ <FileCRC32Calculator file="external/commons-logging-1.2.jar" property="o.apache.commons.logging.crc32" />
<jar jarfile="${cluster}/${module.jar}">
- <zipfileset src="external/commons-logging-1.1.1.jar"/>
+ <zipfileset src="external/commons-logging-1.2.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.logging"/>
- <attribute name="Bundle-Version" value="1.1.1"/>
- <attribute name="Export-Package" value="org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1""/>
+ <attribute name="Bundle-Version" value="1.2"/>
+ <attribute name="Export-Package" value="org.apache.commons.logging;version="1.2",org.apache.commons.logging.impl;version="1.2""/>
<attribute name="NB-Original-CRC" value="${o.apache.commons.logging.crc32}"/>
</manifest>
</jar>
diff --git a/platform/o.apache.commons.logging/external/binaries-list b/platform/o.apache.commons.logging/external/binaries-list
index 5f56286..a138b33 100644
--- a/platform/o.apache.commons.logging/external/binaries-list
+++ b/platform/o.apache.commons.logging/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.
-5043BFEBC3DB072ED80FBD362E7CAF00E885D8AE commons-logging:commons-logging:1.1.1
+4BFC12ADFE4842BF07B657F0369C4CB522955686 commons-logging:commons-logging:1.2
diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.1.1-license.txt b/platform/o.apache.commons.logging/external/commons-logging-1.2-license.txt
similarity index 99%
rename from platform/o.apache.commons.logging/external/commons-logging-1.1.1-license.txt
rename to platform/o.apache.commons.logging/external/commons-logging-1.2-license.txt
index d68b66f..e0ec386 100644
--- a/platform/o.apache.commons.logging/external/commons-logging-1.1.1-license.txt
+++ b/platform/o.apache.commons.logging/external/commons-logging-1.2-license.txt
@@ -1,9 +1,9 @@
Name: Apache Jakarta Commons Logging
Origin: Apache Software Foundation
-Version: 1.1.1
+Version: 1.2
License: Apache-2.0
Description: Logging component
-URL: http://commons.apache.org/logging/
+URL: https://commons.apache.org/proper/commons-logging/
Apache License
Version 2.0, January 2004
diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.1.1-notice.txt b/platform/o.apache.commons.logging/external/commons-logging-1.2-notice.txt
similarity index 100%
rename from platform/o.apache.commons.logging/external/commons-logging-1.1.1-notice.txt
rename to platform/o.apache.commons.logging/external/commons-logging-1.2-notice.txt
diff --git a/platform/o.apache.commons.logging/manifest.mf b/platform/o.apache.commons.logging/manifest.mf
index 98eac9c..5ee5883 100644
--- a/platform/o.apache.commons.logging/manifest.mf
+++ b/platform/o.apache.commons.logging/manifest.mf
@@ -1 +1,2 @@
OpenIDE-Module: org.apache.commons.logging
+OpenIDE-Module-Specification-Version: 1.2
\ No newline at end of file
diff --git a/platform/o.apache.commons.logging/nbproject/project.properties b/platform/o.apache.commons.logging/nbproject/project.properties
index 8788807..bcbd9b1 100644
--- a/platform/o.apache.commons.logging/nbproject/project.properties
+++ b/platform/o.apache.commons.logging/nbproject/project.properties
@@ -15,4 +15,6 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
+javac.source=1.8
+javac.compilerargs=-Xlint -Xlint:-serial
nbm.module.author=Tomas Stupka
diff --git a/platform/o.apache.commons.logging/nbproject/project.xml b/platform/o.apache.commons.logging/nbproject/project.xml
index d3855ff..7bcdd5d 100644
--- a/platform/o.apache.commons.logging/nbproject/project.xml
+++ b/platform/o.apache.commons.logging/nbproject/project.xml
@@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-apache-commons-logging.jar</runtime-relative-path>
- <binary-origin>external/commons-logging-1.1.1.jar</binary-origin>
+ <binary-origin>external/commons-logging-1.2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists