Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D4A53200AE4 for ; Tue, 10 May 2016 16:42:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D1137160877; Tue, 10 May 2016 14:42:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AB86F160A12 for ; Tue, 10 May 2016 16:42:11 +0200 (CEST) Received: (qmail 8184 invoked by uid 500); 10 May 2016 14:42:10 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 8010 invoked by uid 99); 10 May 2016 14:42:10 -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; Tue, 10 May 2016 14:42:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5912DDFDD0; Tue, 10 May 2016 14:42:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: erick@apache.org To: commits@lucene.apache.org Date: Tue, 10 May 2016 14:42:11 -0000 Message-Id: In-Reply-To: <83d3ab2ac6e743ddbb17fd58fa4bbdc8@git.apache.org> References: <83d3ab2ac6e743ddbb17fd58fa4bbdc8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/24] lucene-solr:branch_6x: SOLR-9083: Remove deprecated and from schemas (cherry picked from commit 5341918) archived-at: Tue, 10 May 2016 14:42:14 -0000 http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml index b274aff..e22eb2b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml @@ -26,540 +26,565 @@ --> - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text - id - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text + id + + + + + + + http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml index 9e2f947..287d4fe 100644 --- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/schema.xml @@ -16,10 +16,6 @@ limitations under the License. --> - - - - - + http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema index fd7be83..b9f09f9 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema +++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema @@ -16,16 +16,12 @@ limitations under the License. --> - - - - - id + id http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml index 2a276af..aab5e81 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml @@ -16,17 +16,13 @@ limitations under the License. --> - - - - + - - id + id http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml index 78172ef..981e522 100644 --- a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml @@ -16,14 +16,10 @@ limitations under the License. --> - - - - - - - - id + + + + id http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml b/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml index 9e2f947..287d4fe 100644 --- a/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/minimal/conf/schema.xml @@ -16,10 +16,6 @@ limitations under the License. --> - - - - - + http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml ---------------------------------------------------------------------- diff --git a/solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml b/solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml index 1288cf4..287d4fe 100644 --- a/solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml +++ b/solr/core/src/test-files/solr/configsets/resource-sharing/schema.xml @@ -16,10 +16,6 @@ limitations under the License. --> - - - - - + http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java index 683dbe8..70fcc69 100644 --- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java @@ -164,14 +164,11 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 { } private static String withWhich = "\n" + - " \n" + " \n" + " \n" + " \n" + - " \n" + " id\n" + "\n" + - " \n" + " \n" + " \n" + " \n" + @@ -181,18 +178,14 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 { " \n" + " \n" + " " + - " \n" + " " + ""; private static String withoutWhich = "\n" + - " \n" + " \n" + " \n" + - " \n" + " id\n" + "\n" + - " \n" + " \n" + " \n" + " \n" + @@ -201,7 +194,6 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 { " \n" + " \n" + " " + - " \n" + " " + ""; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03a06bb3/solr/example/example-DIH/solr/db/conf/managed-schema ---------------------------------------------------------------------- diff --git a/solr/example/example-DIH/solr/db/conf/managed-schema b/solr/example/example-DIH/solr/db/conf/managed-schema index 156c776..eead56f 100644 --- a/solr/example/example-DIH/solr/db/conf/managed-schema +++ b/solr/example/example-DIH/solr/db/conf/managed-schema @@ -68,7 +68,7 @@ - - - + + + + - - - - - - - - id