Return-Path: X-Original-To: apmail-gora-commits-archive@www.apache.org Delivered-To: apmail-gora-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3D76D1023C for ; Fri, 13 Feb 2015 06:55:55 +0000 (UTC) Received: (qmail 58254 invoked by uid 500); 13 Feb 2015 06:26:18 -0000 Delivered-To: apmail-gora-commits-archive@gora.apache.org Received: (qmail 57410 invoked by uid 500); 13 Feb 2015 06:26:17 -0000 Mailing-List: contact commits-help@gora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gora.apache.org Delivered-To: mailing list commits@gora.apache.org Received: (qmail 55210 invoked by uid 99); 13 Feb 2015 06:07:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 06:07:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB81FE03A1; Fri, 13 Feb 2015 06:07:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lewismc@apache.org To: commits@gora.apache.org Date: Fri, 13 Feb 2015 06:07:18 -0000 Message-Id: <7b009b449e8f4092bb85b629e9c632d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Feb 4 15:30:49 2015 -0800 Committer: Lewis John McGibbney 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 @@ 2.0.2 1.1-4 - 4.8.1 - 4.8.1 + 4.10.3 + 4.10.3 8.1.8.v20121106 - 1.5 - 4.2.3 + 1.7 + 4.3.1 1.3.2 2.3.1