b00be6
From 226e8614bd078479c3f99712f63f6dfbf1c46b0c Mon Sep 17 00:00:00 2001
b00be6
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
b00be6
Date: Thu, 19 Jan 2012 17:12:16 +0100
b00be6
Subject: [PATCH 1/3] Fix shading and remove unneeded modules
b00be6
b00be6
---
b00be6
 hawtjni-generator/pom.xml    |   28 ----------------------------
b00be6
 maven-hawtjni-plugin/pom.xml |    7 +++++++
b00be6
 pom.xml                      |    2 --
b00be6
 3 files changed, 7 insertions(+), 30 deletions(-)
b00be6
b00be6
diff --git a/hawtjni-generator/pom.xml b/hawtjni-generator/pom.xml
b00be6
index fac8cc2..35b8aaa 100644
b00be6
--- a/hawtjni-generator/pom.xml
b00be6
+++ b/hawtjni-generator/pom.xml
b00be6
@@ -68,32 +68,4 @@
b00be6
     </dependency>
b00be6
   </dependencies>
b00be6
   
b00be6
-  <build>
b00be6
-    <plugins>
b00be6
-      
b00be6
-      
b00be6
-      <plugin>
b00be6
-        <groupId>org.apache.maven.plugins</groupId>
b00be6
-        <artifactId>maven-shade-plugin</artifactId>
b00be6
-        <version>1.3</version>
b00be6
-        <executions>
b00be6
-          <execution>
b00be6
-            <phase>package</phase>
b00be6
-            <goals>
b00be6
-              <goal>shade</goal>
b00be6
-            </goals>
b00be6
-            <configuration>
b00be6
-              <artifactSet>
b00be6
-                <excludes>
b00be6
-                  <exclude>junit:junit</exclude>
b00be6
-                </excludes>
b00be6
-              </artifactSet>
b00be6
-            </configuration>
b00be6
-          </execution>
b00be6
-        </executions>
b00be6
-      </plugin>
b00be6
-      
b00be6
-    </plugins>
b00be6
-  </build>
b00be6
-
b00be6
 </project>
b00be6
diff --git a/maven-hawtjni-plugin/pom.xml b/maven-hawtjni-plugin/pom.xml
b00be6
index 8ef99be..c0f4109 100644
b00be6
--- a/maven-hawtjni-plugin/pom.xml
b00be6
+++ b/maven-hawtjni-plugin/pom.xml
b00be6
@@ -74,9 +74,16 @@
b00be6
 
b00be6
     <dependency>
b00be6
       <groupId>org.apache.maven</groupId>
b00be6
+      <artifactId>maven-compat</artifactId>
b00be6
+      <version>3.0.3</version>
b00be6
+    </dependency>
b00be6
+
b00be6
+    <dependency>
b00be6
+      <groupId>org.apache.maven</groupId>
b00be6
       <artifactId>maven-artifact-manager</artifactId>
b00be6
       <version>2.0</version>
b00be6
     </dependency>
b00be6
+
b00be6
     <dependency>
b00be6
       <groupId>org.apache.maven</groupId>
b00be6
       <artifactId>maven-artifact</artifactId>
b00be6
diff --git a/pom.xml b/pom.xml
b00be6
index fe2e17b..dfad938 100644
b00be6
--- a/pom.xml
b00be6
+++ b/pom.xml
b00be6
@@ -210,8 +210,6 @@
b00be6
     <module>hawtjni-runtime</module>
b00be6
     <module>hawtjni-generator</module>
b00be6
     <module>maven-hawtjni-plugin</module>
b00be6
-    <module>hawtjni-example</module>
b00be6
-    <module>hawtjni-website</module>
b00be6
   </modules>
b00be6
 
b00be6
 </project>
b00be6
-- 
b00be6
1.7.7.4
b00be6