You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/07/01 23:35:47 UTC
svn commit: r1498707 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/NOTICE.txt solr/test-framework/ solr/test-framework/ivy.xml
Author: markrmiller
Date: Mon Jul 1 21:35:47 2013
New Revision: 1498707
URL: http://svn.apache.org/r1498707
Log:
SOLR-4916: Update NOTICE file and remove log4j from test-framework dependencies
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
Modified: lucene/dev/branches/branch_4x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/NOTICE.txt?rev=1498707&r1=1498706&r2=1498707&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/solr/NOTICE.txt Mon Jul 1 21:35:47 2013
@@ -11,6 +11,8 @@ including, but not limited to:
- Apache Lucene Java
- Apache Commons
- Apache Geronimo (stax API)
+ - Apache Blur
+ - Apache Hadoop
This product includes the JQuery JavaScript library created by John Resig.
Copyright (c) 2010 John Resig, http://jquery.com/
@@ -72,6 +74,9 @@ License: Common Development and Distribu
HSQL Database (HSQLDB): http://hsqldb.org/
License: http://hsqldb.org/web/hsqlLicense.html
+Jersey Core: https://jersey.java.net/
+License: Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html)
+
=========================================================================
== Apache Lucene Notice ==
=========================================================================
@@ -88,7 +93,6 @@ including, but not limited to:
- Apache Jakarta Regexp
- Apache Commons
- Apache Xerces
- - Apache Blur
ICU4J, (under analysis/icu) is licensed under an MIT styles license
and Copyright (c) 1995-2008 International Business Machines Corporation and others
@@ -550,3 +554,11 @@ Restlet is a registered trademark of Res
This product contains software developed by the Restlet project.
See http://www.restlet.org/
+
+=========================================================================
+== Protocol Buffers Notice ==
+=========================================================================
+
+Protocol Buffers - Google's data interchange format
+Copyright 2008 Google Inc.
+http://code.google.com/apis/protocolbuffers/
Modified: lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml?rev=1498707&r1=1498706&r2=1498707&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/test-framework/ivy.xml Mon Jul 1 21:35:47 2013
@@ -47,7 +47,6 @@
<dependency org="org.apache.hadoop" name="hadoop-hdfs" transitive="false" rev="&hadoop.version;" conf="default->*;junit4-stdalone->*">
<artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests" />
</dependency>
- <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" />
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" transitive="false"/>
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" transitive="false"/>
<dependency org="com.sun.jersey" name="jersey-core" rev="1.16" transitive="false"/>