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 2020/02/26 20:14:39 UTC
[netbeans] branch master updated: Update winp and use
processtreekiller from maven central
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 eb93b70 Update winp and use processtreekiller from maven central
new d271f39 Merge pull request #1899 from matthiasblaesing/processtreekiller_maven
eb93b70 is described below
commit eb93b70a0fb67dee3bcaf0a083f47a8384122b73
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Jan 16 23:04:17 2020 +0100
Update winp and use processtreekiller from maven central
Tested on Linux, Windows, Solaris, macOS
---
ide/extexecution.process/external/binaries-list | 6 ++---
.../external/libpam4j-1.1-license.txt | 28 ----------------------
...nse.txt => processtreekiller-2.0.1-license.txt} | 10 ++++----
...winp-1.26-license.txt => winp-1.28-license.txt} | 2 +-
.../nbproject/project.properties | 5 ++--
ide/extexecution.process/nbproject/project.xml | 18 ++++----------
6 files changed, 14 insertions(+), 55 deletions(-)
diff --git a/ide/extexecution.process/external/binaries-list b/ide/extexecution.process/external/binaries-list
index 8337bc6..cd654a1 100644
--- a/ide/extexecution.process/external/binaries-list
+++ b/ide/extexecution.process/external/binaries-list
@@ -15,7 +15,5 @@
# specific language governing permissions and limitations
# under the License.
#
-4E84CDA13657513FAE498C45D77075B38CF6EE21 org.jvnet.winp:winp:1.26
-2E07375E5CA3A452472F0E87FB33F243F7A5C08C org.jvnet.libpam4j:libpam4j:1.1
-# processtreekiller is not available in Maven, and its web page was hosted in Kenai, now extinct.
-6819C79348FCF4F5125C834E7D3B742582DCA34D processtreekiller-1.0.7.jar
+8DCFCC7214E73A906786B80704784D90FB593E75 org.jvnet.winp:winp:1.28
+93A5E6FC4B7E18B78B68EEC0212CBD0B253F15AE eu.doppel-helix.netbeans.lib:processtreekiller:2.0.1
diff --git a/ide/extexecution.process/external/libpam4j-1.1-license.txt b/ide/extexecution.process/external/libpam4j-1.1-license.txt
deleted file mode 100644
index ec13621..0000000
--- a/ide/extexecution.process/external/libpam4j-1.1-license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Name: libpam4j
-Version: 1.1
-License: MIT
-Origin: https://libpam4j.dev.java.net
-Source: https://libpam4j.dev.java.net
-Description: Java binding for Unix PAM library.
-
-The MIT License
-
-Copyright (c) __YEARS__, __NAMES__
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/ide/extexecution.process/external/processtreekiller-1.0.7-license.txt b/ide/extexecution.process/external/processtreekiller-2.0.1-license.txt
similarity index 81%
rename from ide/extexecution.process/external/processtreekiller-1.0.7-license.txt
rename to ide/extexecution.process/external/processtreekiller-2.0.1-license.txt
index 07415d1..e35dccd 100644
--- a/ide/extexecution.process/external/processtreekiller-1.0.7-license.txt
+++ b/ide/extexecution.process/external/processtreekiller-2.0.1-license.txt
@@ -1,13 +1,13 @@
-Name: nb-processtree-killer
-Version: 1.0.7
+Name: NetBeans processtreekiller
+Version: 2.0.1
License: MIT
-Origin: http://kenai.com/projects/nb-process-killler
-Source: http://kenai.com/projects/nb-process-killler
+Origin: https://github.com/matthiasblaesing/netbeans-processtreekiller
+Source: https://github.com/matthiasblaesing/netbeans-processtreekiller
Description: Library allowing to kill external process trees.
The MIT License
-Copyright (c) __YEARS__, __NAMES__
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/ide/extexecution.process/external/winp-1.26-license.txt b/ide/extexecution.process/external/winp-1.28-license.txt
similarity index 98%
rename from ide/extexecution.process/external/winp-1.26-license.txt
rename to ide/extexecution.process/external/winp-1.28-license.txt
index a54ca6d..7d4e801 100644
--- a/ide/extexecution.process/external/winp-1.26-license.txt
+++ b/ide/extexecution.process/external/winp-1.28-license.txt
@@ -1,5 +1,5 @@
Name: winp
-Version: 1.26
+Version: 1.28
License: MIT-winp
Origin: https://github.com/kohsuke/winp
Source: https://github.com/kohsuke/winp
diff --git a/ide/extexecution.process/nbproject/project.properties b/ide/extexecution.process/nbproject/project.properties
index dccfd07..b5fd1b4 100644
--- a/ide/extexecution.process/nbproject/project.properties
+++ b/ide/extexecution.process/nbproject/project.properties
@@ -17,6 +17,5 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/winp-1.26.jar=modules/ext/winp-1.26.jar
-release.external/libpam4j-1.1.jar=modules/ext/libpam4j-1.1.jar
-release.external/processtreekiller-1.0.7.jar=modules/ext/processtreekiller-1.0.7.jar
+release.external/winp-1.28.jar=modules/ext/winp-1.28.jar
+release.external/processtreekiller-2.0.1.jar=modules/ext/processtreekiller-2.0.1.jar
\ No newline at end of file
diff --git a/ide/extexecution.process/nbproject/project.xml b/ide/extexecution.process/nbproject/project.xml
index a316e96..5038f36 100644
--- a/ide/extexecution.process/nbproject/project.xml
+++ b/ide/extexecution.process/nbproject/project.xml
@@ -26,12 +26,6 @@
<code-name-base>org.netbeans.modules.extexecution.process</code-name-base>
<module-dependencies>
<dependency>
- <code-name-base>org.apache.commons.io</code-name-base>
- <run-dependency>
- <specification-version>1.4</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.libs.jna</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -68,16 +62,12 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/winp-1.26.jar</runtime-relative-path>
- <binary-origin>external/winp-1.26.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/libpam4j-1.1.jar</runtime-relative-path>
- <binary-origin>external/libpam4j-1.1.jar</binary-origin>
+ <runtime-relative-path>ext/winp-1.28.jar</runtime-relative-path>
+ <binary-origin>external/winp-1.28.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/processtreekiller-1.0.7.jar</runtime-relative-path>
- <binary-origin>external/processtreekiller-1.0.7.jar</binary-origin>
+ <runtime-relative-path>ext/processtreekiller-2.0.1.jar</runtime-relative-path>
+ <binary-origin>external/processtreekiller-2.0.1.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