git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Struberg <struberg@yahoo.de>
To: git@vger.kernel.org, spearce@spearce.org
Cc: Mark Struberg <struberg@yahoo.de>
Subject: [JGIT PATCH 3/9] moving some license files and META-INF
Date: Wed, 23 Sep 2009 23:16:04 +0200	[thread overview]
Message-ID: <1253740570-10718-3-git-send-email-struberg@yahoo.de> (raw)
In-Reply-To: <1253740570-10718-2-git-send-email-struberg@yahoo.de>

Signed-off-by: Mark Struberg <struberg@yahoo.de>

removed LICENSE files from submodules. One in the parent folder is enough.
---
 org.spearce.jgit.test/LICENSE => LICENSE           |    0
 NOTICE                                             |    7 ++++
 .../lib => licenses}/JSch.LICENSE.txt              |    0
 org.spearce.jgit/LICENSE                           |   34 --------------------
 org.spearce.jgit/lib/jsch-0.1.37.jar               |  Bin 206178 -> 0 bytes
 org.spearce.jgit/lib/jsch-0.1.37.zip               |  Bin 268804 -> 0 bytes
 .../{ => src/main/resources}/META-INF/MANIFEST.MF  |    0
 7 files changed, 7 insertions(+), 34 deletions(-)
 rename org.spearce.jgit.test/LICENSE => LICENSE (100%)
 create mode 100644 NOTICE
 rename {org.spearce.jgit/lib => licenses}/JSch.LICENSE.txt (100%)
 delete mode 100644 org.spearce.jgit/LICENSE
 delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.jar
 delete mode 100644 org.spearce.jgit/lib/jsch-0.1.37.zip
 rename org.spearce.jgit/{ => src/main/resources}/META-INF/MANIFEST.MF (100%)

diff --git a/org.spearce.jgit.test/LICENSE b/LICENSE
similarity index 100%
rename from org.spearce.jgit.test/LICENSE
rename to LICENSE
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..c19fbc3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,7 @@
+JGIT Java native GIT core library
+
+see LICENSE for mor information
+
+This product uses the library jsch-0.1.38.jar as binary, 
+home page of the project is http://www.jcraft.com/jsch/ 
+
diff --git a/org.spearce.jgit/lib/JSch.LICENSE.txt b/licenses/JSch.LICENSE.txt
similarity index 100%
rename from org.spearce.jgit/lib/JSch.LICENSE.txt
rename to licenses/JSch.LICENSE.txt
diff --git a/org.spearce.jgit/LICENSE b/org.spearce.jgit/LICENSE
deleted file mode 100644
index 2917c22..0000000
--- a/org.spearce.jgit/LICENSE
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * - Neither the name of the Git Development Community nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT OWNER OR
- * CONTRIBUTORS 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/org.spearce.jgit/lib/jsch-0.1.37.jar b/org.spearce.jgit/lib/jsch-0.1.37.jar
deleted file mode 100644
index e38c4b3..0000000
Binary files a/org.spearce.jgit/lib/jsch-0.1.37.jar and /dev/null differ
diff --git a/org.spearce.jgit/lib/jsch-0.1.37.zip b/org.spearce.jgit/lib/jsch-0.1.37.zip
deleted file mode 100644
index 63f3575..0000000
Binary files a/org.spearce.jgit/lib/jsch-0.1.37.zip and /dev/null differ
diff --git a/org.spearce.jgit/META-INF/MANIFEST.MF b/org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from org.spearce.jgit/META-INF/MANIFEST.MF
rename to org.spearce.jgit/src/main/resources/META-INF/MANIFEST.MF
-- 
1.6.2.5

  parent reply	other threads:[~2009-09-23 21:16 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-23 21:16 [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> Mark Struberg
     [not found] ` <1253740570-10718-2-git-send-email-struberg@yahoo.de>
2009-09-23 21:16   ` Mark Struberg [this message]
2009-09-23 21:16     ` [JGIT PATCH 4/9] checkin all eclipse project file changes Mark Struberg
2009-09-23 21:16       ` [JGIT PATCH 5/9] mavenized org.spearce.jgit.pgm Mark Struberg
2009-09-23 21:16         ` [JGIT PATCH 6/9] enable missing test cases and fix jgit executable creation Mark Struberg
2009-09-23 21:16           ` [JGIT PATCH 7/9] removing eclipse project files Mark Struberg
2009-09-23 21:16             ` [JGIT PATCH 8/9] renamed the PathSuffixFilter test to JUnit conventions, so it gets executed via maven test Mark Struberg
2009-09-23 21:16               ` [JGIT PATCH 9/9] Add the <scm> section to the parent pom Mark Struberg
2009-09-24  6:29             ` [JGIT PATCH 7/9] removing eclipse project files Ferry Huberts
2009-09-24  6:55               ` Mark Struberg
2009-09-24  7:57                 ` Ferry Huberts
2009-09-24  8:24                   ` Mark Struberg
2009-09-24  8:57                     ` Ferry Huberts
2009-09-24  8:57                     ` Ferry Huberts
2009-09-25 21:40                 ` Robin Rosenberg
2009-09-24 11:24             ` Sohn, Matthias
2009-09-24 11:50               ` Mark Struberg
2009-09-25 13:25                 ` Douglas Campos
2009-09-25 21:17                 ` Robin Rosenberg
2009-09-26 20:10                   ` Mark Struberg
2009-09-27 19:52                     ` Robin Rosenberg
2009-09-28  2:21                       ` Jonas Fonseca
2009-09-28  6:34                         ` Robin Rosenberg
2009-09-28  6:42                           ` Robin Rosenberg
2009-09-25 21:33 ` [JGIT PATCH 1/9] mavenizing step 1: moved over the initial poms from Jasons branch Signed-off-by: Mark Struberg <struberg@yahoo.de> Robin Rosenberg
2009-09-26 19:50   ` Mark Struberg
2009-09-28 12:46     ` Jonas Fonseca
2009-09-30 19:51       ` Mark Struberg
2009-09-30 21:16         ` Shawn O. Pearce
2009-09-30 23:13           ` Mark Struberg
2009-09-30 23:16             ` Jason van Zyl
2009-10-01 11:15               ` Mark Struberg
2009-10-01 13:55                 ` Jason van Zyl
2009-10-01  1:33           ` Jonas Fonseca
2009-10-01  2:05           ` Douglas Campos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1253740570-10718-3-git-send-email-struberg@yahoo.de \
    --to=struberg@yahoo.de \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).