Return-Path: X-Original-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94E969751 for ; Mon, 26 Nov 2012 16:34:30 +0000 (UTC) Received: (qmail 93470 invoked by uid 500); 26 Nov 2012 16:34:30 -0000 Delivered-To: apmail-incubator-crunch-commits-archive@incubator.apache.org Received: (qmail 93390 invoked by uid 500); 26 Nov 2012 16:34:28 -0000 Mailing-List: contact crunch-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: crunch-dev@incubator.apache.org Delivered-To: mailing list crunch-commits@incubator.apache.org Received: (qmail 93364 invoked by uid 99); 26 Nov 2012 16:34:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2012 16:34:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2DA8D319E3E; Mon, 26 Nov 2012 16:34:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mafr@apache.org To: crunch-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: CRUNCH-115: Fix licensing issues. Message-Id: <20121126163427.2DA8D319E3E@tyr.zones.apache.org> Date: Mon, 26 Nov 2012 16:34:27 +0000 (UTC) Updated Branches: refs/heads/master a9a65eae1 -> 72caac7d8 CRUNCH-115: Fix licensing issues. Remove library version numbers from LICENSE to make maintaining it less error prone. Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/72caac7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/72caac7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/72caac7d Branch: refs/heads/master Commit: 72caac7d8b31a7ef717e673724c2f9cd590224bf Parents: a9a65ea Author: Matthias Friedrich Authored: Wed Nov 21 19:33:34 2012 +0100 Committer: Matthias Friedrich Committed: Mon Nov 26 17:33:32 2012 +0100 ---------------------------------------------------------------------- LICENSE | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/72caac7d/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index a53cdbc..883cf35 100644 --- a/LICENSE +++ b/LICENSE @@ -248,24 +248,24 @@ and conditions of their respective licenses. -------------------------------------------------------------------------------- The Apache License, Version 2 (see above), for: - avro-1.7.0.jar - avro-mapred-1.7.0.jar - commons-io-2.1.jar - commons-lang-2.4.jar - guava-11.0.2.jar - jansi-1.4.jar - javassist-3.16.1-GA.jar - snappy-java-1.0.4.1.jar - cglib (included in mockto-all-1.9.0.jar) + avro + avro-mapred + commons-io + commons-lang + guava + jansi + javassist + snappy-java + cglib (included in mockto-all) -------------------------------------------------------------------------------- The Scala License (see above), for: - scala-compiler-2.9.2.jar - scala-library-2.9.2.jar - jline-2.9.2.jar + scala-compiler + scala-library + jline -------------------------------------------------------------------------------- -A BSD-style license for hamcrest-core-1.1.jar: +A BSD-style license for hamcrest-core: BSD License @@ -297,7 +297,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -A BSD-style license for jsr305-1.3.9.jar: +A BSD-style license for jsr305: Copyright (c) 2007-2009, JSR305 expert group All rights reserved. @@ -329,7 +329,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -A BSD-style license for paranamer-2.3.jar: +A BSD-style license for paranamer: Copyright (c) 2006 Paul Hammant & ThoughtWorks Inc All rights reserved. @@ -359,7 +359,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -A BSD-style license for snappy, included in snappy-java-1.0.4.1.jar: +A BSD-style license for snappy, included in snappy-java: Copyright 2011, Google Inc. All rights reserved. @@ -391,7 +391,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -A BSD-style license for asm, included in mockito-all-1.9.0.jar: +A BSD-style license for asm, included in mockito-all: Copyright (c) 2000-2005 INRIA, France Telecom @@ -425,7 +425,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- -The MIT License for mockito-all-1.9.0.jar: +The MIT License for mockito-all: The MIT License @@ -450,7 +450,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- -The MIT License for objenesis, included in mockito-all-1.9.0.jar: +The MIT License for objenesis, included in mockito-all: Copyright (c) 2003-2009, Objenesis Team and all contributors @@ -472,7 +472,7 @@ 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. -------------------------------------------------------------------------------- -Common Public License 1.0 for junit-4.10.jar: +Common Public License 1.0 for junit: JUnit