You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/06/17 17:15:51 UTC
[GitHub] matthiasblaesing closed pull request #593: [NETBEANS-837] Update
winp to released 1.26 version and fix license
matthiasblaesing closed pull request #593: [NETBEANS-837] Update winp to released 1.26 version and fix license
URL: https://github.com/apache/incubator-netbeans/pull/593
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/extexecution.process/build.xml b/extexecution.process/build.xml
index cd408199e..f13ec3438 100644
--- a/extexecution.process/build.xml
+++ b/extexecution.process/build.xml
@@ -22,47 +22,4 @@
<project basedir="." default="build" name="extexecution.process">
<description>Builds, tests, and runs the project org.netbeans.modules.extexecution.process</description>
<import file="../nbbuild/templates/projectized.xml"/>
-
- <!-- A task to check if the binary 'external/winp-1.14-patched.jar exists -->
- <target name="-check-requires-patching-maven-sources">
- <available file="external/winp-1.14-patched.jar" property="sources-already-patched" />
- </target>
-
- <!--
- '-javac-init' task is invoked after maven sources have been downloaded
- to 'external/winp-1.14-sources.jar'
- (see external/binaries-list).
- Then if 'external/winp-1.14-patched.jar does NOT exist...
- -->
- <target name="-prepare-patched-binary" depends="-check-requires-patching-maven-sources" unless="sources-already-patched">
- <echo message="Patching winp-1.14-sources.jar for Netbeans..." />
- <taskdef name="patchfile" classname="org.netbeans.nbbuild.extlibs.PatchFile" classpath="${nbantext.jar}"/>
- <!-- ... 1. Prepares a 'build/external-patch/[sources|classes]' working directories -->
- <delete dir="build/external-patch" />
- <mkdir dir="build/external-patch/sources" />
- <!-- ... 2. Unzips maven sources -->
- <unzip src="external/winp-1.14-sources.jar" dest="build/external-patch/sources" />
- <!-- ... 3. Applies patch 'external/winp-1.14-netbeans.patch -->
- <patchfile dir="build/external-patch/sources"
- patchfile="external/winp.patch" />
- <!-- ... 4. Compiles sources to build/external-patch/classes -->
- <mkdir dir="build/external-patch/classes" />
- <javac srcdir="build/external-patch/sources"
- destdir="build/external-patch/classes" >
- <exclude name="org/apache/xml/resolver/tests/**" />
- </javac>
- <!-- ... 4.1. Copy DLLs in sources to classes -->
- <copy todir="build/external-patch/classes">
- <fileset dir="build/external-patch/sources">
- <include name="**/**.dll" />
- </fileset>
- </copy>
- <!-- ... 5. Creates a jar in 'external/winp-1.14-patched.jar' -->
- <jar destfile="external/winp-1.14-patched.jar">
- <fileset dir="build/external-patch/classes" />
- </jar>
- </target>
-
- <!-- Hook into harness "-javac-init" task -->
- <target name="-javac-init" depends="-prepare-patched-binary, projectized-common.-javac-init" />
</project>
diff --git a/extexecution.process/external/binaries-list b/extexecution.process/external/binaries-list
index 2cc34cd6d..8337bc65e 100644
--- a/extexecution.process/external/binaries-list
+++ b/extexecution.process/external/binaries-list
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
#
-40E6E127818C371375F8E8D42BBEAF613BDA63A2 org.jvnet.winp:winp:1.14:sources
+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
diff --git a/extexecution.process/external/winp-1.14-patched-license.txt b/extexecution.process/external/winp-1.26-license.txt
similarity index 76%
rename from extexecution.process/external/winp-1.14-patched-license.txt
rename to extexecution.process/external/winp-1.26-license.txt
index e686e1721..a54ca6d5e 100644
--- a/extexecution.process/external/winp-1.14-patched-license.txt
+++ b/extexecution.process/external/winp-1.26-license.txt
@@ -1,14 +1,13 @@
Name: winp
-Version: 1.14
-License: MIT
-Origin: https://winp.dev.java.net
-Source: https://winp.dev.java.net
+Version: 1.26
+License: MIT-winp
+Origin: https://github.com/kohsuke/winp
+Source: https://github.com/kohsuke/winp
Description: Library allowing to control windows processes.
-Files: winp-1.14-sources.jar
-The MIT License
+MIT License
-Copyright (c) __YEARS__, __NAMES__
+Copyright (c) 2008-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -17,13 +16,13 @@ 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 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/extexecution.process/external/winp.patch b/extexecution.process/external/winp.patch
deleted file mode 100644
index c6669bb83..000000000
--- a/extexecution.process/external/winp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-diff -ruN org/jvnet/winp/Native.java patched-org/jvnet/winp/Native.java
---- org/jvnet/winp/Native.java 2009-11-10 10:30:26.000000000 +0100
-+++ patched-org/jvnet/winp/Native.java 2017-10-22 07:11:19.462328071 +0200
-@@ -73,8 +73,9 @@
- filePortion = filePortion.substring(2);
- filePortion = URLDecoder.decode(filePortion);
- String preferred = System.getProperty(DLL_TARGET);
-- File jarFile = new File(preferred != null ? preferred : filePortion);
-- File dllFile = new File(jarFile.getParentFile(),dllName+".dll");
-+ File jarFile = new File(filePortion);
-+ File dllFile = new File(preferred != null
-+ ? new File(preferred) : jarFile.getParentFile(),dllName+".dll");
- if(!dllFile.exists() || jarFile.lastModified()>dllFile.lastModified()) {
- // try to extract from within the jar
- try {
diff --git a/extexecution.process/nbproject/project.properties b/extexecution.process/nbproject/project.properties
index c05a34006..2295b3db2 100644
--- a/extexecution.process/nbproject/project.properties
+++ b/extexecution.process/nbproject/project.properties
@@ -17,6 +17,6 @@
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-release.external/winp-1.14-patched.jar=modules/ext/winp-1.14-patched.jar
+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
diff --git a/extexecution.process/nbproject/project.xml b/extexecution.process/nbproject/project.xml
index cc1b41df8..81c88cfc7 100644
--- a/extexecution.process/nbproject/project.xml
+++ b/extexecution.process/nbproject/project.xml
@@ -68,8 +68,8 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/winp-1.14-patched.jar</runtime-relative-path>
- <binary-origin>external/winp-1.14-patched.jar</binary-origin>
+ <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>
diff --git a/nbbuild/licenses/MIT-winp b/nbbuild/licenses/MIT-winp
new file mode 100644
index 000000000..8ae0b3f8f
--- /dev/null
+++ b/nbbuild/licenses/MIT-winp
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2008-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
+
+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.
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists