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:48 UTC
[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
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" />