You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2013/01/09 16:34:38 UTC
svn commit: r1430898 - in /zookeeper/bookkeeper/trunk: CHANGES.txt NOTICE
bookkeeper-server/pom.xml
bookkeeper-server/src/main/resources/NOTICE.bin.txt hedwig-server/pom.xml
hedwig-server/src/main/resources/NOTICE.bin.txt
Author: fpj
Date: Wed Jan 9 15:34:38 2013
New Revision: 1430898
URL: http://svn.apache.org/viewvc?rev=1430898&view=rev
Log:
BOOKKEEPER-541: Add guava to notice file (ivank via fpj)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/NOTICE
zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt
zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Jan 9 15:34:38 2013
@@ -236,6 +236,8 @@ Trunk (unreleased changes)
BOOKKEEPER-523: Every test should have a timeout (ivank, sijie via fpj)
+ BOOKKEEPER-541: Add guava to notice file (ivank via fpj)
+
bookkeeper-server:
BOOKKEEPER-328: Bookie DeathWatcher is missing thread name (Rakesh via sijie)
Modified: zookeeper/bookkeeper/trunk/NOTICE
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/NOTICE?rev=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/NOTICE (original)
+++ zookeeper/bookkeeper/trunk/NOTICE Wed Jan 9 15:34:38 2013
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011-2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Wed Jan 9 15:34:38 2013
@@ -29,6 +29,7 @@
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.libdir>${basedir}/lib</project.libdir>
</properties>
<dependencies>
<dependency>
@@ -201,11 +202,24 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/lib</outputDirectory>
+ <outputDirectory>${project.libdir}</outputDirectory>
+ <includeScope>runtime</includeScope>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.libdir}</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
Modified: 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=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/resources/NOTICE.bin.txt Wed Jan 9 15:34:38 2013
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011-2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
@@ -18,6 +18,7 @@ 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 Codec 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
@@ -31,3 +32,4 @@ This project includes:
The Netty Project under Apache License, Version 2.0
ZooKeeper under Apache License, Version 2.0
Protocol Buffer Java API under New BSD license
+ Guava under The Apache Software License, Version 2.0
Modified: zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/pom.xml?rev=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/pom.xml Wed Jan 9 15:34:38 2013
@@ -26,6 +26,7 @@
</parent>
<properties>
<mainclass>org.apache.hedwig.server.netty.PubSubServer</mainclass>
+ <project.libdir>${basedir}/lib</project.libdir>
</properties>
<artifactId>hedwig-server</artifactId>
<packaging>jar</packaging>
@@ -225,7 +226,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/lib</outputDirectory>
+ <outputDirectory>${project.libdir}</outputDirectory>
</configuration>
</execution>
</executions>
@@ -240,6 +241,18 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${project.libdir}</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: 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=1430898&r1=1430897&r2=1430898&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/resources/NOTICE.bin.txt Wed Jan 9 15:34:38 2013
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011-2012 The Apache Software Foundation
+Copyright 2011-2013 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
@@ -19,6 +19,7 @@ This project includes:
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 Codec 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
@@ -35,4 +36,5 @@ This project includes:
SLF4J LOG4J-12 Binding under MIT License
The Netty Project under Apache License, Version 2.0
ZooKeeper under Apache License, Version 2.0
+ Guava under The Apache Software License, Version 2.0