You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2014/03/07 13:34:20 UTC

svn commit: r1575247 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bin/test-patch-00-clean bookkeeper-server/pom.xml pom.xml

Author: ivank
Date: Fri Mar  7 12:34:19 2014
New Revision: 1575247

URL: http://svn.apache.org/r1575247
Log:
BOOKKEEPER-730: Shade pom file missing apache license header (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bin/test-patch-00-clean
    zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
    zookeeper/bookkeeper/trunk/pom.xml

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1575247&r1=1575246&r2=1575247&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri Mar  7 12:34:19 2014
@@ -172,6 +172,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-715: bookie: delay dropping journal cached pages (sijie via ivank)
 
+        BOOKKEEPER-730: Shade pom file missing apache license header (ivank)
+
       hedwig-server:
 
         BOOKKEEPER-601: readahead cache size isn't updated correctly (sijie via fpj)

Modified: zookeeper/bookkeeper/trunk/bin/test-patch-00-clean
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bin/test-patch-00-clean?rev=1575247&r1=1575246&r2=1575247&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bin/test-patch-00-clean (original)
+++ zookeeper/bookkeeper/trunk/bin/test-patch-00-clean Fri Mar  7 12:34:19 2014
@@ -89,6 +89,8 @@ pre)
     exit $EXITCODE
     ;;
 post)
+    mvn clean ${MVNPASSTHRU} >> ${TEMPDIR}/${TASKNAME}.txt
+    EXITCODE=$?
     ;;
 report)
     echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1575247&r1=1575246&r2=1575247&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Fri Mar  7 12:34:19 2014
@@ -197,6 +197,30 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>1.6</version>
+        <configuration>
+          <canUpdateCopyright>false</canUpdateCopyright>
+          <roots><root>${project.basedir}</root></roots>
+        </configuration>
+        <executions>
+          <execution>
+            <id>update-pom-license</id>
+            <goals>
+              <goal>update-file-header</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <licenseName>apache_v2</licenseName>
+              <includes>
+                <include>dependency-reduced-pom.xml</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.2</version>
@@ -225,7 +249,6 @@
           <excludes>
             <!-- exclude generated file //-->
             <exclude>**/DataFormats.java</exclude>
-            <exclude>dependency-reduced-pom.xml</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -260,7 +283,13 @@
               <directory>${project.libdir}</directory>
               <followSymlinks>false</followSymlinks>
             </fileset>
-	  </filesets>
+            <fileset>
+              <directory>${project.basedir}</directory>
+              <includes>
+                <include>dependency-reduced-pom.xml</include>
+              </includes>
+            </fileset>
+          </filesets>
 	</configuration>
       </plugin>
     </plugins>

Modified: zookeeper/bookkeeper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/pom.xml?rev=1575247&r1=1575246&r2=1575247&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/pom.xml Fri Mar  7 12:34:19 2014
@@ -30,6 +30,7 @@
   <artifactId>bookkeeper</artifactId>
   <packaging>pom</packaging>
   <name>bookkeeper</name>
+  <inceptionYear>2011</inceptionYear>
   <modules>
     <module>compat-deps</module>
     <module>hedwig-client</module>