Revision: 1469
Author: mcculls
Date: Tue Jan  4 07:16:27 2011
Log: Add standard Apache LICENSE and NOTICE files to the Maven build
http://code.google.com/p/google-guice/source/detail?r=1469

Modified:
 /trunk/core/pom.xml
 /trunk/extensions/pom.xml
 /trunk/pom.xml

=======================================
--- /trunk/core/pom.xml Tue Jan  4 05:28:49 2011
+++ /trunk/core/pom.xml Tue Jan  4 07:16:27 2011
@@ -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>

=======================================
--- /trunk/extensions/pom.xml   Fri Dec 10 07:05:01 2010
+++ /trunk/extensions/pom.xml   Tue Jan  4 07:16:27 2011
@@ -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>
=======================================
--- /trunk/pom.xml      Fri Dec 10 07:52:38 2010
+++ /trunk/pom.xml      Tue Jan  4 07:16:27 2011
@@ -148,13 +148,32 @@
     </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>

--
You received this message because you are subscribed to the Google Groups 
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/google-guice-dev?hl=en.

Reply via email to