zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1338616 - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-benchmark/ bookkeeper-server/ bookkeeper-server/src/main/resources/ hedwig-client/ hedwig-protocol/ hedwig-server/ hedwig-server/src/main/resources/ src/assemble/
Date Tue, 15 May 2012 10:04:58 GMT
Author: ivank
Date: Tue May 15 10:04:56 2012
New Revision: 1338616

URL: http://svn.apache.org/viewvc?rev=1338616&view=rev
Log:
BOOKKEEPER-145: Put notice and license file for distributed binaries in SVN (ivank)

Added:
    zookeeper/bookkeeper/trunk/LICENSE
      - copied, changed from r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt
    zookeeper/bookkeeper/trunk/NOTICE
      - copied, changed from r1336645, zookeeper/bookkeeper/trunk/NOTICE.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/LICENSE.bin.txt
      - copied, changed from r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt
    zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/LICENSE.bin.txt
      - copied, changed from r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt
    zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt
Removed:
    zookeeper/bookkeeper/trunk/LICENSE.txt
    zookeeper/bookkeeper/trunk/NOTICE.txt
Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
    zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
    zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
    zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
    zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
    zookeeper/bookkeeper/trunk/pom.xml
    zookeeper/bookkeeper/trunk/src/assemble/bin.xml
    zookeeper/bookkeeper/trunk/src/assemble/src.xml

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue May 15 10:04:56 2012
@@ -10,6 +10,8 @@ Trunk (unreleased changes)
 
     BUGFIXES:
 
+      BOOKKEEPER-145: Put notice and license file for distributed binaries in SVN (ivank)
+
       bookkeeper-server/
 
         BOOKKEEPER-142: Parsing last log id is wrong, which may make entry log files overwritten
(Sijie Gou via ivank)

Copied: zookeeper/bookkeeper/trunk/LICENSE (from r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/LICENSE?p2=zookeeper/bookkeeper/trunk/LICENSE&p1=zookeeper/bookkeeper/trunk/LICENSE.txt&r1=1336645&r2=1338616&rev=1338616&view=diff
==============================================================================
    (empty)

Copied: zookeeper/bookkeeper/trunk/NOTICE (from r1336645, zookeeper/bookkeeper/trunk/NOTICE.txt)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/NOTICE?p2=zookeeper/bookkeeper/trunk/NOTICE&p1=zookeeper/bookkeeper/trunk/NOTICE.txt&r1=1336645&r2=1338616&rev=1338616&view=diff
==============================================================================
    (empty)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml Tue May 15 10:04:56 2012
@@ -31,6 +31,17 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+	  <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Tue May 15 10:04:56 2012
@@ -123,6 +123,15 @@
         </configuration>
       </plugin>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <descriptors>
+	    <descriptor>../src/assemble/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+      <plugin>
 	<artifactId>maven-dependency-plugin</artifactId>
 	<executions>
 	  <execution>

Copied: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/LICENSE.bin.txt (from
r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/LICENSE.bin.txt?p2=zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/LICENSE.bin.txt&p1=zookeeper/bookkeeper/trunk/LICENSE.txt&r1=1336645&r2=1338616&rev=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/LICENSE.txt (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/LICENSE.bin.txt Tue May
15 10:04:56 2012
@@ -200,3 +200,66 @@
    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.
+
+------------------------------------------------------------------------------------
+For lib/slf4j-*.jar
+
+ Copyright (c) 2004-2011 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------------------
+For lib/jline-*.jar
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt?rev=1338616&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt Tue May
15 10:04:56 2012
@@ -0,0 +1,30 @@
+Licensed 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.
+
+This project includes:
+  Apache Log4j under The Apache Software License, Version 2.0
+  Commons BeanUtils Core under The Apache Software License, Version 2.0
+  Commons CLI under The Apache Software License, Version 2.0
+  Commons Collections under The Apache Software License, Version 2.0
+  Commons Configuration under The Apache Software License, Version 2.0
+  Commons IO under The Apache Software License, Version 2.0
+  Commons Lang under The Apache Software License, Version 2.0
+  Commons Logging under The Apache Software License, Version 2.0
+  commons Beanutils under Apache License, Version 2.0
+  Commons Digester under The Apache Software License, Version 2.0
+  JLine under BSD
+  SLF4J API Module under MIT License
+  SLF4J LOG4J-12 Binding under MIT License
+  The Netty Project under Apache License, Version 2.0
+  ZooKeeper under Apache License, Version 2.0
+

Modified: zookeeper/bookkeeper/trunk/hedwig-client/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/pom.xml Tue May 15 10:04:56 2012
@@ -114,6 +114,13 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+	  <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
 	<groupId>org.apache.rat</groupId>
 	<artifactId>apache-rat-plugin</artifactId>
 	<version>0.7</version>

Modified: zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-protocol/pom.xml Tue May 15 10:04:56 2012
@@ -48,6 +48,13 @@
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+	  <skipAssembly>true</skipAssembly>
+        </configuration>
+      </plugin>
+      <plugin>
 	<groupId>org.apache.rat</groupId>
 	<artifactId>apache-rat-plugin</artifactId>
 	<version>0.7</version>

Modified: zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/pom.xml Tue May 15 10:04:56 2012
@@ -36,7 +36,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.8.1</version>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -128,6 +128,15 @@
 	  </excludes>
 	</configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <descriptors>
+	    <descriptor>../src/assemble/bin.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
 <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Copied: zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/LICENSE.bin.txt (from
r1336645, zookeeper/bookkeeper/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/LICENSE.bin.txt?p2=zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/LICENSE.bin.txt&p1=zookeeper/bookkeeper/trunk/LICENSE.txt&r1=1336645&r2=1338616&rev=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/LICENSE.txt (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/LICENSE.bin.txt Tue May 15
10:04:56 2012
@@ -200,3 +200,103 @@
    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.
+
+------------------------------------------------------------------------------------
+For lib/slf4j-*.jar
+
+ Copyright (c) 2004-2011 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------------------
+For lib/protobuf-java-*.jar
+
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
+
+------------------------------------------------------------------------------------
+For lib/jline-*.jar
+
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+

Added: zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt?rev=1338616&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt (added)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt Tue May 15
10:04:56 2012
@@ -0,0 +1,35 @@
+Licensed 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.
+
+This project includes:
+  Apache Log4j under The Apache Software License, Version 2.0
+  BookKeeper Server under The Apache Software License, Version 2.0
+  Commons BeanUtils Core under The Apache Software License, Version 2.0
+  Commons CLI under The Apache Software License, Version 2.0
+  Commons Collections under The Apache Software License, Version 2.0
+  Commons Configuration under The Apache Software License, Version 2.0
+  Commons IO under The Apache Software License, Version 2.0
+  Commons Lang under The Apache Software License, Version 2.0
+  Commons Logging under The Apache Software License, Version 2.0
+  commons-beanutils under Apache License, Version 2.0
+  Derby Engine under Apache License, Version 2.0
+  Digester under The Apache Software License, Version 2.0
+  Hedwig Client under The Apache Software License, Version 2.0
+  Hedwig Protocol under The Apache Software License, Version 2.0
+  JLine under BSD
+  Protocol Buffer Java API under New BSD license
+  SLF4J API Module under MIT License
+  SLF4J LOG4J-12 Binding under MIT License
+  The Netty Project under Apache License, Version 2.0
+  ZooKeeper under Apache License, Version 2.0
+

Modified: zookeeper/bookkeeper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/pom.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/pom.xml Tue May 15 10:04:56 2012
@@ -92,8 +92,8 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2.1</version>
         <configuration>
+	  <tarLongFileMode>gnu</tarLongFileMode>
           <descriptors>
-            <descriptor>src/assemble/bin.xml</descriptor>
             <descriptor>src/assemble/src.xml</descriptor>
           </descriptors>
         </configuration>

Modified: zookeeper/bookkeeper/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/src/assemble/bin.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/src/assemble/bin.xml (original)
+++ zookeeper/bookkeeper/trunk/src/assemble/bin.xml Tue May 15 10:04:56 2012
@@ -27,7 +27,7 @@
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>${project.name}-${project.version}.jar</include>
+        <include>${project.artifactId}-${project.version}.jar</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -38,25 +38,42 @@
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
+      <fileMode>644</fileMode>
       <includes>
         <include>${basedir}/*.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>..</directory>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>CHANGES.txt</include>
-        <include>NOTICE.txt</include>
-        <include>README</include>
-      </includes>
-    </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>../CHANGES.txt</source>
+      <outputDirectory>/</outputDirectory>
+      <fileMode>644</fileMode>
+    </file>
+    <file>
+      <source>../README</source>
+      <outputDirectory>/</outputDirectory>
+      <fileMode>644</fileMode>
+    </file>
+    <file>
+      <source>${basedir}/src/main/resources/LICENSE.bin.txt</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>LICENSE</destName>
+      <fileMode>644</fileMode>
+    </file>
+    <file>
+      <source>${basedir}/src/main/resources/NOTICE.bin.txt</source>
+      <outputDirectory>/</outputDirectory>
+      <destName>NOTICE</destName>
+      <fileMode>644</fileMode>
+    </file>
+  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
   </dependencySets>
 </assembly>

Modified: zookeeper/bookkeeper/trunk/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/src/assemble/src.xml?rev=1338616&r1=1338615&r2=1338616&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/src/assemble/src.xml (original)
+++ zookeeper/bookkeeper/trunk/src/assemble/src.xml Tue May 15 10:04:56 2012
@@ -28,6 +28,8 @@
       <useDefaultExcludes>true</useDefaultExcludes>
       <includes>
         <include>**/README</include>
+        <include>**/LICENSE</include>
+        <include>**/NOTICE</include>
         <include>**/pom.xml</include>
         <include>**/src/**</include>
         <include>**/conf/**</include>



Mime
View raw message