This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 6270332954 Update ASF profiler native binaries to
profiler-external-binaries-1-24aefa9
new 26b736ef06 Merge pull request #6502 from
neilcsmith-net/profiler-binaries
6270332954 is described below
commit 627033295456548805aa0b5dac3a2eaef741d127
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Fri Sep 29 14:33:48 2023 +0100
Update ASF profiler native binaries to profiler-external-binaries-1-24aefa9
---
.gitignore | 1 -
profiler/lib.profiler/build.xml | 10 +++++++---
profiler/lib.profiler/external/binaries-list | 2 +-
...se.txt => profiler-external-binaries-1-24aefa9-license.txt} | 6 +++---
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 24e3ba11d1..6750ca4b18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,6 @@ derby.log
/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/Token.java
/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/TokenMgrError.java
/profiler/lib.profiler/release/lib/
-/profiler/lib.profiler/release/BUILDINFO.txt
/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/
/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
diff --git a/profiler/lib.profiler/build.xml b/profiler/lib.profiler/build.xml
index 86b9661601..9251064f0e 100644
--- a/profiler/lib.profiler/build.xml
+++ b/profiler/lib.profiler/build.xml
@@ -30,10 +30,14 @@
<unzip src="external/profiler-external-binaries-8.2.zip"
overwrite="false"
dest="${profiler.cluster}"/>
- <!-- AL2 licensed binaries, build from ASF code (overwrites CDDL
binaries) -->
- <unzip
src="external/profiler-external-binaries-ASF-5273a10f9471d5cf60ed894dc26ec0e59e71cc24.zip"
+ <!-- AL2 licensed binaries from ASF code -->
+ <unzip src="external/profiler-external-binaries-1-24aefa9.zip"
overwrite="true"
- dest="${profiler.cluster}"/>
+ dest="${profiler.cluster}">
+ <patternset>
+ <include name="lib/**"/>
+ </patternset>
+ </unzip>
</target>
<!-- Compile the JFluid engine system library, that depends on JDK version -
so there are two libraries -->
diff --git a/profiler/lib.profiler/external/binaries-list
b/profiler/lib.profiler/external/binaries-list
index 467cd8e0e9..f36c5e5015 100644
--- a/profiler/lib.profiler/external/binaries-list
+++ b/profiler/lib.profiler/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
45225DCFC94A9782419E95C70957822A0C44612D profiler-external-binaries-8.2.zip
-B1C1B951F79716EFFAB9BEC96A611844B038E2E2
profiler-external-binaries-ASF-5273a10f9471d5cf60ed894dc26ec0e59e71cc24.zip
+AD1F88D2B35874756A192ACD033A17AAD8C6535C
https://archive.apache.org/dist/netbeans/native/netbeans-profiler/1-24aefa9/profiler-external-binaries-1-24aefa9.zip
profiler-external-binaries-1-24aefa9.zip
diff --git
a/profiler/lib.profiler/external/profiler-external-binaries-ASF-5273a10f9471d5cf60ed894dc26ec0e59e71cc24-license.txt
b/profiler/lib.profiler/external/profiler-external-binaries-1-24aefa9-license.txt
similarity index 98%
rename from
profiler/lib.profiler/external/profiler-external-binaries-ASF-5273a10f9471d5cf60ed894dc26ec0e59e71cc24-license.txt
rename to
profiler/lib.profiler/external/profiler-external-binaries-1-24aefa9-license.txt
index 2d071a4197..e0c44eedbb 100644
---
a/profiler/lib.profiler/external/profiler-external-binaries-ASF-5273a10f9471d5cf60ed894dc26ec0e59e71cc24-license.txt
+++
b/profiler/lib.profiler/external/profiler-external-binaries-1-24aefa9-license.txt
@@ -1,9 +1,9 @@
Name: Profiler Binaries
-Description: Profiler Binaries for a large variety of platforms, superseds
older CDDL binaries where applicable.
-Version: 5273a10f9471d5cf60ed894dc26ec0e59e71cc24
+Description: Profiler Binaries for variety of platforms, supersedes older CDDL
binaries where applicable.
+Version: 1-24aefa9
License: Apache-2.0-ASF
Source: https://netbeans.apache.org
-Origin: Apache NetBeans (version is commit hash)
+Origin: Apache NetBeans (version includes commit hash)
Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
