From 51db00a313d93e5b24468b5fb70165304cb572eb Mon Sep 17 00:00:00 2001
From: Steve Rowe <sarowe@apache.org>
Date: Mon, 21 Nov 2016 18:03:40 -0500
Subject: [PATCH] LUCENE-7543: Added note to dev-tools/doap/README.txt about
 maintaining the website .htaccess file.  Cleaned up DOAP files: added full
 Aapache license reference; added info about canonical URLs; dropped useles
 stylesheet processing instruction.

---
 dev-tools/doap/README.txt |  3 +++
 dev-tools/doap/lucene.rdf | 28 +++++++++++++++++++++-------
 dev-tools/doap/solr.rdf   | 28 +++++++++++++++++++++-------
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c807a..9726d2f56b6 100644
--- a/dev-tools/doap/README.txt
+++ b/dev-tools/doap/README.txt
@@ -2,4 +2,7 @@ This folder contains the DOAP[1] files for each project.
 
 Upon release, these files should be updated to include new release details.
 
+NOTE: If this folder's contents are moved elsewhere, the website .htaccess
+file will need to be updated.
+
 [1] DOAP: https://github.com/edumbill/doap
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467443d..b6643ba491b 100644
--- a/dev-tools/doap/lucene.rdf
+++ b/dev-tools/doap/lucene.rdf
@@ -1,21 +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.    
+-->
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
 <rdf:RDF xml:lang="en"
          xmlns="http://usefulinc.com/ns/doap#"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:asfext="http://projects.apache.org/ns/asfext#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/">
 <!--
-  =======================================================================
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
-
-  =======================================================================
+  Note that the canonical URL may redirect to other non-canonical locations.
 -->
   <Project rdf:about="http://lucene.apache.org/core/">
     <created>2001-09-01</created>
-    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0"/>
     <name>Apache Lucene Core</name>
     <homepage rdf:resource="http://lucene.apache.org/core/" />
     <asfext:pmc rdf:resource="http://lucene.apache.org" />
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64da29..87f246365f9 100644
--- a/dev-tools/doap/solr.rdf
+++ b/dev-tools/doap/solr.rdf
@@ -1,21 +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.    
+-->
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl"?>
 <rdf:RDF xml:lang="en"
          xmlns="http://usefulinc.com/ns/doap#"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:asfext="http://projects.apache.org/ns/asfext#"
          xmlns:foaf="http://xmlns.com/foaf/0.1/">
 <!--
-  =======================================================================
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
-
-  =======================================================================
+  Note that the canonical URL may redirect to other non-canonical locations.
 -->
   <Project rdf:about="http://lucene.apache.org/solr/">
     <created>2006-01-17</created>
-    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+    <license rdf:resource="http://www.apache.org/licenses/LICENSE-2.0"/>
     <name>Apache Solr</name>
     <homepage rdf:resource="http://lucene.apache.org/solr/" />
     <asfext:pmc rdf:resource="http://lucene.apache.org" />