From commits-return-9679-archive-asf-public=cust-asf.ponee.io@manifoldcf.apache.org  Sun Feb 25 23:37:58 2018
Return-Path: <commits-return-9679-archive-asf-public=cust-asf.ponee.io@manifoldcf.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id ECC6718064C
	for <archive-asf-public@cust-asf.ponee.io>; Sun, 25 Feb 2018 23:37:57 +0100 (CET)
Received: (qmail 74711 invoked by uid 500); 25 Feb 2018 22:37:57 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 74702 invoked by uid 99); 25 Feb 2018 22:37:57 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Feb 2018 22:37:57 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 333843A0114
	for <commits@manifoldcf.apache.org>; Sun, 25 Feb 2018 22:37:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1825330 - in
 /manifoldcf/integration/solr-7.x/branches/release-2.2-branch: ./
 CHANGES.txt pom.xml
Date: Sun, 25 Feb 2018 22:37:54 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180225223756.333843A0114@svn01-us-west.apache.org>

Author: kwright
Date: Sun Feb 25 22:37:54 2018
New Revision: 1825330

URL: http://svn.apache.org/viewvc?rev=1825330&view=rev
Log:
Pull up fix for CONNECTORS-1496 from trunk, and prepare for a point release.

Modified:
    manifoldcf/integration/solr-7.x/branches/release-2.2-branch/   (props changed)
    manifoldcf/integration/solr-7.x/branches/release-2.2-branch/CHANGES.txt
    manifoldcf/integration/solr-7.x/branches/release-2.2-branch/pom.xml

Propchange: manifoldcf/integration/solr-7.x/branches/release-2.2-branch/
------------------------------------------------------------------------------
    svn:mergeinfo = /manifoldcf/integration/solr-7.x/trunk:1825314

Modified: manifoldcf/integration/solr-7.x/branches/release-2.2-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/branches/release-2.2-branch/CHANGES.txt?rev=1825330&r1=1825329&r2=1825330&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/branches/release-2.2-branch/CHANGES.txt (original)
+++ manifoldcf/integration/solr-7.x/branches/release-2.2-branch/CHANGES.txt Sun Feb 25 22:37:54 2018
@@ -1,6 +1,11 @@
 Apache ManifoldCF Plugin for Apache Solr 7.x change Log
 $Id$
 
+======================= Release 2.2.1 ======================
+
+CONNECTORS-1496: Upgrade to Solr 7.2.1.
+(Shinichiro Abe)
+
 ======================= Release 2.2 ======================
 
 Initial commit: Upgraded to Solr 7.0.0.

Modified: manifoldcf/integration/solr-7.x/branches/release-2.2-branch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-7.x/branches/release-2.2-branch/pom.xml?rev=1825330&r1=1825329&r2=1825330&view=diff
==============================================================================
--- manifoldcf/integration/solr-7.x/branches/release-2.2-branch/pom.xml (original)
+++ manifoldcf/integration/solr-7.x/branches/release-2.2-branch/pom.xml Sun Feb 25 22:37:54 2018
@@ -22,7 +22,7 @@
 
   <name>ManifoldCF Solr 7.x Plugin</name>
   <artifactId>apache-manifoldcf-solr-7.x-plugin</artifactId>
-  <version>2.2</version>
+  <version>2.2.1</version>
   <packaging>jar</packaging>
   <description>ManifoldCF Plugin for Apache Solr 7.x</description>
   <inceptionYear>2017</inceptionYear>
@@ -34,7 +34,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <solr.version>7.0.0</solr.version>
+    <solr.version>7.2.1</solr.version>
   </properties>
 
   <dependencies>
@@ -61,6 +61,14 @@
       <type>jar</type>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.7.7</version>
+      <type>jar</type>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>