You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/11/21 23:07:46 UTC

[1/8] lucene-solr:branch_5_5: 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 proc

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_5_5 4b1be24b2 -> 76bad3801
  refs/heads/branch_5x f150963b4 -> d41bb6f46
  refs/heads/branch_6_0 429deea9b -> 97ccb67b1
  refs/heads/branch_6_1 763dd1a10 -> ef989afb6
  refs/heads/branch_6_2 1a488f371 -> 0a6d25080
  refs/heads/branch_6_3 3c885149d -> 45f34c99d
  refs/heads/branch_6x 25d2d8d27 -> c069dbc14
  refs/heads/master 33ff6cde9 -> 51db00a31


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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/76bad380
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/76bad380
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/76bad380

Branch: refs/heads/branch_5_5
Commit: 76bad38018e3d17e0e004bcac81c81662ee05632
Parents: 4b1be24
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:03:40 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76bad380/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76bad380/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76bad380/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[4/8] lucene-solr:branch_6_1: 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 proc

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ef989afb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ef989afb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ef989afb

Branch: refs/heads/branch_6_1
Commit: ef989afb649a5ff2794673a17b205af361fa83af
Parents: 763dd1a
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:04:24 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef989afb/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef989afb/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ef989afb/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[8/8] lucene-solr:master: 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 processi

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/51db00a3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/51db00a3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/51db00a3

Branch: refs/heads/master
Commit: 51db00a313d93e5b24468b5fb70165304cb572eb
Parents: 33ff6cd
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:06:40 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51db00a3/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51db00a3/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51db00a3/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[5/8] lucene-solr:branch_6_2: 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 proc

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0a6d2508
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0a6d2508
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0a6d2508

Branch: refs/heads/branch_6_2
Commit: 0a6d2508045d2e11b2bfb3f33a177562d2c8a5d8
Parents: 1a488f3
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:04:36 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0a6d2508/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0a6d2508/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0a6d2508/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[2/8] lucene-solr:branch_5x: 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 proce

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d41bb6f4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d41bb6f4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d41bb6f4

Branch: refs/heads/branch_5x
Commit: d41bb6f46a5869d7a18e13258aa26bd2d5713ea0
Parents: f150963
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:04:00 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d41bb6f4/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d41bb6f4/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d41bb6f4/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[6/8] lucene-solr:branch_6_3: 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 proc

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/45f34c99
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/45f34c99
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/45f34c99

Branch: refs/heads/branch_6_3
Commit: 45f34c99dad9bc62ea4a1ab5b1ca8515801e9e48
Parents: 3c88514
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:06:18 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/45f34c99/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/45f34c99/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/45f34c99/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[7/8] lucene-solr:branch_6x: 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 proce

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c069dbc1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c069dbc1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c069dbc1

Branch: refs/heads/branch_6x
Commit: c069dbc147deff79abd1cdd2da329ab426fcd3f8
Parents: 25d2d8d
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:06:31 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c069dbc1/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c069dbc1/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c069dbc1/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />


[3/8] lucene-solr:branch_6_0: 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 proc

Posted by sa...@apache.org.
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.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/97ccb67b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/97ccb67b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/97ccb67b

Branch: refs/heads/branch_6_0
Commit: 97ccb67b1dbb72b4d169071cd6cc30999a367804
Parents: 429deea
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Nov 21 18:03:40 2016 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Nov 21 18:04:13 2016 -0500

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97ccb67b/dev-tools/doap/README.txt
----------------------------------------------------------------------
diff --git a/dev-tools/doap/README.txt b/dev-tools/doap/README.txt
index f2a9a9c..9726d2f 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97ccb67b/dev-tools/doap/lucene.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/lucene.rdf b/dev-tools/doap/lucene.rdf
index 8f70467..b6643ba 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2016 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/lucene/doap.rdf
 
-  =======================================================================
+  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" />

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/97ccb67b/dev-tools/doap/solr.rdf
----------------------------------------------------------------------
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index 1483c64..87f2463 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/">
 <!--
-  =======================================================================
-
-   Copyright (c) 2007 The Apache Software Foundation.
-   All rights reserved.
+  This file's canonical URL is: http://lucene.apache.org/solr/doap.rdf
 
-  =======================================================================
+  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" />