From e544c6fa9e15e7277da79e2464243e90b2706b8c Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Mon, 24 Jan 2022 14:59:25 +0100
Subject: Cleanup Added variables to Makefiles to specify custom exports/
 directory; Split exception classes in Java & C#; Added more comments; Renamed
 library and Go package; Removed real (pure) tests; Added generate_lib.ps1 to
 generate import .lib for Windows (Swift); Moved built Go libraries to
 exports/lib/; Switch to hopefully faster Swift GitHub Action.

---
 wrappers/java/pom.xml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'wrappers/java/pom.xml')

diff --git a/wrappers/java/pom.xml b/wrappers/java/pom.xml
index bd9f721..520bd34 100644
--- a/wrappers/java/pom.xml
+++ b/wrappers/java/pom.xml
@@ -10,9 +10,11 @@
     <name>eduVPN common library</name>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	    <maven.compiler.source>1.8</maven.compiler.source>
+	    <maven.compiler.target>1.8</maven.compiler.target>
+
+	    <EXPORTS_LIB_PATH>../../exports/lib</EXPORTS_LIB_PATH>
     </properties>
 
     <dependencies>
@@ -40,21 +42,21 @@
             <!-- See com.sun.jna.Platform#getNativeLibraryResourcePrefix -->
 
             <resource>
-                <directory>../../exports/linux/amd64</directory>
+	            <directory>${EXPORTS_LIB_PATH}/linux/amd64</directory>
                 <includes>
                     <include>*.so</include>
                 </includes>
                 <targetPath>linux-x86-64</targetPath>
             </resource>
             <resource>
-                <directory>../../exports/linux/arm</directory>
+	            <directory>${EXPORTS_LIB_PATH}/linux/arm</directory>
                 <includes>
                     <include>*.so</include>
                 </includes>
                 <targetPath>linux-arm</targetPath>
             </resource>
             <resource>
-                <directory>../../exports/linux/arm64</directory>
+	            <directory>${EXPORTS_LIB_PATH}/linux/arm64</directory>
                 <includes>
                     <include>*.so</include>
                 </includes>
@@ -62,36 +64,38 @@
             </resource>
 
             <resource>
-                <directory>../../exports/windows/amd64</directory>
+	            <directory>${EXPORTS_LIB_PATH}/windows/amd64</directory>
                 <includes>
                     <include>*.dll</include>
                 </includes>
                 <targetPath>win32-x86-64</targetPath>
             </resource>
             <resource>
-                <directory>../../exports/windows/386</directory>
+	            <directory>${EXPORTS_LIB_PATH}/windows/386</directory>
                 <includes>
                     <include>*.dll</include>
                 </includes>
                 <targetPath>win32-x86</targetPath>
             </resource>
             <resource>
-                <directory>../../exports/windows/arm</directory>
+	            <directory>${EXPORTS_LIB_PATH}/windows/arm</directory>
                 <includes>
                     <include>*.dll</include>
                 </includes>
                 <targetPath>win32-arm</targetPath>
             </resource>
             <resource>
-                <directory>../../exports/windows/arm64</directory>
+	            <directory>${EXPORTS_LIB_PATH}/windows/arm64</directory>
                 <includes>
                     <include>*.dll</include>
                 </includes>
                 <targetPath>win32-arm64</targetPath>
             </resource>
         </resources>
+
         <plugins>
             <plugin>
+	            <!-- Test adapter -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.1</version>
-- 
cgit v1.2.3