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