Author: ctubbsii Date: Sat Jan 26 23:09:57 2013 New Revision: 1438989 URL: http://svn.apache.org/viewvc?rev=1438989&view=rev Log: ACCUMULO-370 Added 'apache' branding to the dist tarball and top-level directory inside the tarball. Also fixed the formatting of the xml LICENSE comment.
Modified: accumulo/trunk/assemble/dist.xml accumulo/trunk/assemble/pom.xml Modified: accumulo/trunk/assemble/dist.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/dist.xml?rev=1438989&r1=1438988&r2=1438989&view=diff ============================================================================== --- accumulo/trunk/assemble/dist.xml (original) +++ accumulo/trunk/assemble/dist.xml Sat Jan 26 23:09:57 2013 @@ -1,20 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- 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. --> +<!-- + 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. +--> <assembly> <id>dist</id> <formats> <format>tar.gz</format> </formats> - <baseDirectory>accumulo-${project.version}</baseDirectory> + <baseDirectory>apache-accumulo-${project.version}</baseDirectory> <fileSets> <fileSet> <directory>../bin</directory> Modified: accumulo/trunk/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1438989&r1=1438988&r2=1438989&view=diff ============================================================================== --- accumulo/trunk/assemble/pom.xml (original) +++ accumulo/trunk/assemble/pom.xml Sat Jan 26 23:09:57 2013 @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- 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. --> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> @@ -87,7 +93,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>${project.parent.artifactId}-${project.version}</finalName> + <finalName>apache-${project.parent.artifactId}-${project.version}</finalName> <descriptors> <descriptor>dist.xml</descriptor> </descriptors>