From b3dee921d09e3dd32502b1a57ba7f56a121d6a2e Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Fri, 3 Jan 2014 17:25:59 +0100
Subject: [PATCH] both halves of JNI being built, tests invoked, fail entirely
---
src/bindings/java/native/linux/pom.xml | 27 ++++++++++++++++++--------
src/bindings/java/native/pom.xml | 1 +
src/bindings/java/pom.xml | 12 ------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/bindings/java/native/linux/pom.xml b/src/bindings/java/native/linux/pom.xml
index 13988c01..c8d3fbd8 100644
--- a/src/bindings/java/native/linux/pom.xml
+++ b/src/bindings/java/native/linux/pom.xml
@@ -25,7 +25,15 @@
</dependencies>
<build>
+ <testSourceDirectory>../src/test/java</testSourceDirectory>
<plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
@@ -57,14 +65,8 @@
<id>javah</id>
<phase>generate-sources</phase>
<configuration>
- <javahOS>hp-ux</javahOS>
- <javahProvider>default</javahProvider>
-<!-- <javahClassNames>
- <javahClassName>Hammer</javahClassName>
- <javahClassName>ParsedToken</javahClassName>
- <javahClassName>Parser</javahClassName>
- <javahClassName>ParseResult</javahClassName>
- </javahClassNames> -->
+ <javahOS>linux</javahOS>
+ <javahProvider>default</javahProvider>
</configuration>
<goals>
<goal>javah</goal>
@@ -72,6 +74,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <environmentVariables>
+ <LD_LIBRARY_PATH>${project.build.directory}:${project.build.directory}/../../../../</LD_LIBRARY_PATH>
+ </environmentVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/src/bindings/java/native/pom.xml b/src/bindings/java/native/pom.xml
index 6a0eb8d2..0427aa54 100644
--- a/src/bindings/java/native/pom.xml
+++ b/src/bindings/java/native/pom.xml
@@ -28,4 +28,5 @@
</modules>
</profile>
</profiles>
+
</project>
diff --git a/src/bindings/java/pom.xml b/src/bindings/java/pom.xml
index 7b6dbad2..2e93de1a 100644
--- a/src/bindings/java/pom.xml
+++ b/src/bindings/java/pom.xml
@@ -38,18 +38,6 @@
</plugin>
</plugins>
</pluginManagement>
-
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <environmentVariables>
- <LD_LIBRARY_PATH>${project.build.directory}/../../</LD_LIBRARY_PATH>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
--
GitLab