You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by le...@apache.org on 2015/02/13 07:07:18 UTC
[1/3] gora git commit: GORA-406 Upgrade Solr dependencies to 4.10.3
Repository: gora
Updated Branches:
refs/heads/master abc8bf7ab -> da71d3078
GORA-406 Upgrade Solr dependencies to 4.10.3
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/29cbf8ab
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/29cbf8ab
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/29cbf8ab
Branch: refs/heads/master
Commit: 29cbf8ab03eb68898db0014e416de27d4932231d
Parents: 390bb21
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Wed Feb 4 15:30:49 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Wed Feb 4 15:30:49 2015 -0800
----------------------------------------------------------------------
gora-solr/src/test/conf/log4j.properties | 35 +++++++++++++++++++++++++++
pom.xml | 8 +++---
2 files changed, 39 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/29cbf8ab/gora-solr/src/test/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/gora-solr/src/test/conf/log4j.properties b/gora-solr/src/test/conf/log4j.properties
new file mode 100644
index 0000000..441fa09
--- /dev/null
+++ b/gora-solr/src/test/conf/log4j.properties
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set root logger level to error
+log4j.rootLogger=DEBUG, Console
+
+log4j.logger.org.apache.zookeeper=WARN
+log4j.logger.org.apache.hadoop=WARN
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
http://git-wip-us.apache.org/repos/asf/gora/blob/29cbf8ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0ddbdb..b168992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -637,11 +637,11 @@
<cassandra.version>2.0.2</cassandra.version>
<hector.version>1.1-4</hector.version>
<!-- Solr Dependencies -->
- <lucene-solr.version>4.8.1</lucene-solr.version>
- <solr-solrj.version>4.8.1</solr-solrj.version>
+ <lucene-solr.version>4.10.3</lucene-solr.version>
+ <solr-solrj.version>4.10.3</solr-solrj.version>
<jetty.version>8.1.8.v20121106</jetty.version>
- <tika.version>1.5</tika.version>
- <httpcomponents.version>4.2.3</httpcomponents.version>
+ <tika.version>1.7</tika.version>
+ <httpcomponents.version>4.3.1</httpcomponents.version>
<commons-io.version>1.3.2</commons-io.version>
<restlet.version>2.3.1</restlet.version>
[2/3] gora git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/gora
Posted by le...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/gora
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/ebf25723
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/ebf25723
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/ebf25723
Branch: refs/heads/master
Commit: ebf2572320f02efa4761e63bc4c977231e9a5ecf
Parents: 29cbf8a abc8bf7
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Feb 12 22:04:49 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Feb 12 22:04:49 2015 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] gora git commit: GORA-406 Upgrade Solr dependencies to 4.10.3
Posted by le...@apache.org.
GORA-406 Upgrade Solr dependencies to 4.10.3
Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/da71d307
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/da71d307
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/da71d307
Branch: refs/heads/master
Commit: da71d3078177c881a532f4a0de39ffa43103f2fd
Parents: ebf2572
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Feb 12 22:07:43 2015 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Feb 12 22:07:43 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/gora/blob/da71d307/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7a40c0e..0ddb8f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@
Current Development 0.6-SNAPSHOT
+* GORA-406 Upgrade Solr dependencies to 4.10.3 (lewismc)
+
* GORA-407 Upgrade restlet dependencies to 2.3.1 for gora-solr (lewismc)
* GORA-388 MongoStore: Fix handling of Utf8 in filters (drazzib)