Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgrade dependencies to JGit 0.8.4

JGit requires Jsch [1] to support operations over SSH
protocol. NetBeans 6.8+ provides a module org.netbeans.libs.jsch
('Java Secure Channel integration') which provides the exact version
of Jsch required by JGit (0.1.41). So remove Jsch from the
distribution.

Update license for JGit 0.8.4 by providing its text and the link to
original source as it is for 0.8.4. However, I'm not sure about
possible license terms' violation for CDDL, GPL and EDL.

[1] http://www.jcraft.com/jsch/

Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
  • Loading branch information...
commit a42177a5987ff9f0a0e87a061c6c15aaf4daa26c 1 parent 5637f28
@manandbytes manandbytes authored
View
28 javahelp/org/nbgit/docs/credits.html
@@ -58,8 +58,14 @@
<li>
More info about JGit/EGit can be found at:<br/>
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
- <param name="content" value="http://code.google.com/p/egit/"/>
- <param name="text" value="<html><u>http://code.google.com/p/egit/</u></html>"/>
+ <param name="content" value="http://www.eclipse.org/egit/"/>
+ <param name="text" value="<html><u>http://www.eclipse.org/egit/</u></html>"/>
+ <param name="textFontSize" value="medium">
+ <param name="textColor" value="blue"/>
+ </object>
+ <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+ <param name="content" value="http://www.eclipse.org/jgit/"/>
+ <param name="text" value="<html><u>http://www.eclipse.org/jgit/</u></html>"/>
<param name="textFontSize" value="medium">
<param name="textColor" value="blue"/>
</object>
@@ -67,28 +73,14 @@
<li>
The specific license for JGit can be found at:<br/>
<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
- <param name="content" value="http://repo.or.cz/w/jgit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD"/>
- <param name="text" value="<html><u>http://repo.or.cz/w/jgit.git?a=blob;f=org.spearce.jgit/LICENSE;hb=HEAD</u></html>"/>
+ <param name="content" value="http://egit.eclipse.org/w/?p=jgit.git;a=blob_plain;f=LICENSE;hb=5ed96eb7f44edb06ebf17eece0f9679ee5713446"/>
+ <param name="text" value="<html><u>http://egit.eclipse.org/w/?p=jgit.git;a=blob_plain;f=LICENSE;hb=HEAD</u></html>"/>
<param name="textFontSize" value="medium">
<param name="textColor" value="blue"/>
</object>
</li>
</ul>
- <h3>JSch</h3>
- <p>
- The SSH transport support in JGit uses JSch. To easy
- installation the version distributed with the JGit/EGit
- project is included in this project. However, Netbeans
- seem to include its own JSch jar file so it might be
- possible to remove this dependency in the future.
- </p>
- <p>
- JSch is distributed under a BSD-style license.
- The license is available in the source repository as
- <code>release/modules/ext/com-jcraft-jsch.LICENSE.txt</code>.
- </p>
-
<h3>OpenBSD fnmatch(3)</h3>
<p>
Support for .gitignore and .git/info/exclude files use
View
2  nbproject/project.properties
@@ -4,6 +4,8 @@ auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+file.reference.org.eclipse.jgit-0.8.4.jar=release/modules/ext/org.eclipse.jgit-0.8.4.jar
+file.reference.org.eclipse.jgit.ui-0.8.4.jar=release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar
javahelp.base=org/nbgit/docs
javahelp.hs=helpset.xml
javac.source=1.5
View
17 nbproject/project.xml
@@ -25,6 +25,15 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.libs.jsch</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.12.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.diff</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -219,12 +228,12 @@
</test-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/org-spearce-jgit.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/org-spearce-jgit.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.jgit-0.8.4.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/org.eclipse.jgit-0.8.4.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/com-jcraft-jsch.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/com-jcraft-jsch.jar</binary-origin>
+ <runtime-relative-path>ext/org.eclipse.jgit.ui-0.8.4.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
View
30 release/modules/ext/com-jcraft-jsch.LICENSE.txt
@@ -1,30 +0,0 @@
-JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
-over to a BSD-style license.
-
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
BIN  release/modules/ext/com-jcraft-jsch.jar
Binary file not shown
View
BIN  release/modules/ext/org-spearce-jgit.jar
Binary file not shown
View
BIN  release/modules/ext/org.eclipse.jgit-0.8.4.jar
Binary file not shown
View
10 .../modules/ext/org-spearce-jgit.LICENSE.txt → .../modules/ext/org.eclipse.jgit.LICENSE.txt
@@ -1,4 +1,11 @@
/*
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or
@@ -13,7 +20,7 @@
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
- * - Neither the name of the Git Development Community nor the
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
* names of its contributors may be used to endorse or promote
* products derived from this software without specific prior
* written permission.
@@ -32,3 +39,4 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
View
BIN  release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar
Binary file not shown
View
2  src/org/nbgit/ui/browser/BrowserTopComponent.form
@@ -50,7 +50,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
- <Component class="org.spearce.jgit.awtui.CommitGraphPane" name="commitGraphPane">
+ <Component class="org.eclipse.jgit.awtui.CommitGraphPane" name="commitGraphPane">
<AuxValues>
<AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="18"/>
</AuxValues>
Please sign in to comment.
Something went wrong with that request. Please try again.