diff --git a/javahelp/org/nbgit/docs/credits.html b/javahelp/org/nbgit/docs/credits.html index 540ce4b..ae8fa80 100644 --- a/javahelp/org/nbgit/docs/credits.html +++ b/javahelp/org/nbgit/docs/credits.html @@ -58,8 +58,14 @@

JGit / EGit

  • More info about JGit/EGit can be found at:
    - - + + + + + + + + @@ -67,28 +73,14 @@

    JGit / EGit

  • The specific license for JGit can be found at:
    - - + +
    • -

    JSch

    -

    - 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. -

    -

    - JSch is distributed under a BSD-style license. - The license is available in the source repository as - release/modules/ext/com-jcraft-jsch.LICENSE.txt. -

    -

    OpenBSD fnmatch(3)

    Support for .gitignore and .git/info/exclude files use diff --git a/nbproject/project.properties b/nbproject/project.properties index ad22da0..b6867b8 100644 --- 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 index c827884..d1f6ebd 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -24,6 +24,15 @@ 1.11.0.1 + + org.netbeans.libs.jsch + + + + 1 + 1.12.1 + + org.netbeans.modules.diff @@ -219,12 +228,12 @@ - ext/org-spearce-jgit.jar - release/modules/ext/org-spearce-jgit.jar + ext/org.eclipse.jgit-0.8.4.jar + release/modules/ext/org.eclipse.jgit-0.8.4.jar - ext/com-jcraft-jsch.jar - release/modules/ext/com-jcraft-jsch.jar + ext/org.eclipse.jgit.ui-0.8.4.jar + release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar diff --git a/release/modules/ext/com-jcraft-jsch.LICENSE.txt b/release/modules/ext/com-jcraft-jsch.LICENSE.txt deleted file mode 100644 index aa38f5a..0000000 --- a/release/modules/ext/com-jcraft-jsch.LICENSE.txt +++ /dev/null @@ -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. diff --git a/release/modules/ext/com-jcraft-jsch.jar b/release/modules/ext/com-jcraft-jsch.jar deleted file mode 100644 index e38c4b3..0000000 Binary files a/release/modules/ext/com-jcraft-jsch.jar and /dev/null differ diff --git a/release/modules/ext/org-spearce-jgit.jar b/release/modules/ext/org-spearce-jgit.jar deleted file mode 100644 index e3f5051..0000000 Binary files a/release/modules/ext/org-spearce-jgit.jar and /dev/null differ diff --git a/release/modules/ext/org.eclipse.jgit-0.8.4.jar b/release/modules/ext/org.eclipse.jgit-0.8.4.jar new file mode 100644 index 0000000..8152f19 Binary files /dev/null and b/release/modules/ext/org.eclipse.jgit-0.8.4.jar differ diff --git a/release/modules/ext/org-spearce-jgit.LICENSE.txt b/release/modules/ext/org.eclipse.jgit.LICENSE.txt similarity index 79% rename from release/modules/ext/org-spearce-jgit.LICENSE.txt rename to release/modules/ext/org.eclipse.jgit.LICENSE.txt index 2917c22..a628e2e 100644 --- a/release/modules/ext/org-spearce-jgit.LICENSE.txt +++ b/release/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 new file mode 100644 index 0000000..0194443 Binary files /dev/null and b/release/modules/ext/org.eclipse.jgit.ui-0.8.4.jar differ diff --git a/src/org/nbgit/ui/browser/BrowserTopComponent.form b/src/org/nbgit/ui/browser/BrowserTopComponent.form index b432ab1..418009f 100644 --- a/src/org/nbgit/ui/browser/BrowserTopComponent.form +++ b/src/org/nbgit/ui/browser/BrowserTopComponent.form @@ -50,7 +50,7 @@ - +