BOOKKEEPER-541: Add guava to notice file (ivank via fpj)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1430898 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 9, 2013 · 55a6e1b · 55a6e1b
1 parent faf407d
commit 55a6e1b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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)

diff --git a/NOTICE b/NOTICE
@@ -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/).

diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
@@ -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>

diff --git a/bookkeeper-server/src/main/resources/NOTICE.bin.txt b/bookkeeper-server/src/main/resources/NOTICE.bin.txt
@@ -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
diff --git a/hedwig-server/pom.xml b/hedwig-server/pom.xml
@@ -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>
diff --git a/hedwig-server/src/main/resources/NOTICE.bin.txt b/hedwig-server/src/main/resources/NOTICE.bin.txt
@@ -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