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>
manandbytes · Jun 28, 2010 · a42177a · a42177a
1 parent 5637f28
commit a42177a
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 54 deletions.
diff --git a/javahelp/org/nbgit/docs/credits.html b/javahelp/org/nbgit/docs/credits.html
@@ -58,37 +58,29 @@ <h3>JGit / EGit</h3>
    <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>
    </li>
    <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

diff --git a/nbproject/project.properties b/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

diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -24,6 +24,15 @@
                         <specification-version>1.11.0.1</specification-version>
                     </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/>
@@ -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>

diff --git a/release/modules/ext/com-jcraft-jsch.LICENSE.txt b/release/modules/ext/com-jcraft-jsch.LICENSE.txt
diff --git a/release/modules/ext/com-jcraft-jsch.jar b/release/modules/ext/com-jcraft-jsch.jar
diff --git a/release/modules/ext/org-spearce-jgit.jar b/release/modules/ext/org-spearce-jgit.jar
diff --git a/release/modules/ext/org.eclipse.jgit-0.8.4.jar b/release/modules/ext/org.eclipse.jgit-0.8.4.jar
diff --git a/.../modules/ext/org-spearce-jgit.LICENSE.txt → .../modules/ext/org.eclipse.jgit.LICENSE.txt b/.../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.
  */
+
diff --git a/release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar b/release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar
diff --git a/src/org/nbgit/ui/browser/BrowserTopComponent.form b/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>