commit 33018c38a1b26f60c305e6292e8a12db48c78044
author mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> Tue Jan 04 15:16:27 2011 +0000
committer mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> Tue Jan 04 15:16:27 2011 +0000
tree cd872911dad6008dc662c233d7bf9a97817a8da3
parent 92f3eaba61cb2db1f10a3e379a87d43908d92517

Add standard Apache LICENSE and NOTICE files to the Maven build

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1469 d779f126-a31b-0410-b53b-1d3aecad763e

core/pom.xml

diff --git a/core/pom.xml b/core/pom.xml
index de7bac2..e8b27fb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -65,6 +65,12 @@
   <build>
     <plugins>
       <!--
+       | Add standard LICENSE and NOTICE files
+      -->
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+      <!--
        | Enable Java5 conformance checks
       -->
       <plugin>
@@ -91,6 +97,18 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
       </plugin>
+      <!--
+       | Remove duplicate jarjar'd LICENSE and NOTICE
+      -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>LICENSE</exclude>
+            <exclude>NOTICE</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

extensions/pom.xml

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 70db0e9..309e092 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -59,6 +59,12 @@
   <build>
     <plugins>
       <!--
+       | Add standard LICENSE and NOTICE files
+      -->
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+      <!--
        | Enable Java5 conformance checks
       -->
       <plugin>

pom.xml

diff --git a/pom.xml b/pom.xml
index 4cd2a90..100351c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,14 +148,33 @@
     </testResources>
     <pluginManagement>
       <plugins>
+        <!--
+         | Standard LICENSE and NOTICE files
+        -->
         <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>process</goal>
+              </goals>
+              <configuration>
+                <resourceBundles>
+                  <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                </resourceBundles>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <!--
          | Make sure we only use Java5 methods
         -->
         <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
           <version>1.6</version>