diff --git a/pom.xml b/pom.xml
index 5bcb9aa3abbd2ab01d8d8402cc604cb5cba8ebf5..3f2935696f540583703f8ce78cb02dddabce5b43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,405 +1,409 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>au.edu.unimelb.mf</groupId>
- <artifactId>unimelb-mf-clients</artifactId>
- <version>0.5.7</version>
- <packaging>jar</packaging>
- <name>unimelb-mf-clients</name>
- <url>https://gitlab.unimelb.edu.au/resplat-mediaflux/unimelb-mf-clients</url>
- <description>UniMelb Mediaflux clients.</description>
- <properties>
- <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.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format>
- <skipTests>true</skipTests>
- <mexplorer.version>1.3.27_001</mexplorer.version>
- <jreMacFile>openjdk-15.0.2-jre-with-jfx_osx-x64.tar.gz</jreMacFile>
- <jreMacUrl>
- https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_osx-x64.tar.gz
- </jreMacUrl>
- <jreWindowsFile>openjdk-15.0.2-jre-with-jfx_windows-x64.zip</jreWindowsFile>
- <jreWindowsUrl>
- https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_windows-x64.zip
- </jreWindowsUrl>
- <jreLinuxFile>openjdk-15.0.2-jre-with-jfx_linux-x64.tar.gz</jreLinuxFile>
- <jreLinuxUrl>
- https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_linux-x64.tar.gz
- </jreLinuxUrl>
- <dist>${project.build.directory}/dist</dist>
- </properties>
- <repositories>
- <repository>
- <id>resplat-public-mvn-repo</id>
- <name>ResPlat Public Maven Repository</name>
- <url>https://gitlab.unimelb.edu.au/resplat-mediaflux/mvn-repo/raw/master</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>com.arcitecta</groupId>
- <artifactId>mfclient</artifactId>
- <version>4.9.079</version>
- </dependency>
- <dependency>
- <groupId>org.jline</groupId>
- <artifactId>jline</artifactId>
- <version>3.9.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>download-mexplorer</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>https://gitlab.unimelb.edu.au</url>
- <fromFile>
- /resplat-mediaflux/releases/raw/master/mediaflux/mexplorer-${mexplorer.version}.jar
- </fromFile>
- <toFile>${project.build.directory}/mexplorer.jar</toFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <!-- <mainClass>unimelb.mf.client.ssh.cli.SCPPutCLI</mainClass> -->
- </manifest>
- <manifestEntries>
- <App-Version>${project.version}</App-Version>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- <execution>
- <id>make-zip</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/main/assembly/make-zip.xml</descriptor>
- </descriptors>
- <archiverConfig>
- <directoryMode>0755</directoryMode>
- <defaultDirectoryMode>0755</defaultDirectoryMode>
- <fileMode>0644</fileMode>
- </archiverConfig>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>platform-packages</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>prepare-resources</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <mkdir
- dir="${project.build.directory}/classes/unimelb/mf/client"/>
- <copy
- file="${project.basedir}/src/main/resources/unimelb/mf/client/app.properties"
- tofile="${project.build.directory}/classes/unimelb/mf/client/app.properties"/>
- <replace
- file="${project.build.directory}/classes/unimelb/mf/client/app.properties"
- token="@VERSION@" value="${project.version}"/>
- <replace
- file="${project.build.directory}/classes/unimelb/mf/client/app.properties"
- token="@BUILD_TIME@" value="${maven.build.timestamp}"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <phase>package</phase>
- <configuration>
- <target>
- <!-- Initialisation -->
- <tstamp/>
- <delete dir="${dist}"/>
- <mkdir dir="${dist}"/>
+ <groupId>au.edu.unimelb.mf</groupId>
+ <artifactId>unimelb-mf-clients</artifactId>
+ <version>0.5.7</version>
+ <packaging>jar</packaging>
+ <name>unimelb-mf-clients</name>
+ <url>https://gitlab.unimelb.edu.au/resplat-mediaflux/unimelb-mf-clients</url>
+ <description>UniMelb Mediaflux clients.</description>
+ <properties>
+ <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.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format>
+ <skipTests>true</skipTests>
+ <!-- <mexplorer.version>1.3.27_001</mexplorer.version> -->
+ <jreMacFile>openjdk-15.0.2-jre-with-jfx_osx-x64.tar.gz</jreMacFile>
+ <jreMacUrl>
+ https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_osx-x64.tar.gz
+ </jreMacUrl>
+ <jreWindowsFile>openjdk-15.0.2-jre-with-jfx_windows-x64.zip</jreWindowsFile>
+ <jreWindowsUrl>
+ https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_windows-x64.zip
+ </jreWindowsUrl>
+ <jreLinuxFile>openjdk-15.0.2-jre-with-jfx_linux-x64.tar.gz</jreLinuxFile>
+ <jreLinuxUrl>
+ https://gitlab.unimelb.edu.au/resplat-mediaflux/java-downloads/raw/master/openjdk-15.0.2-jre-with-jfx_linux-x64.tar.gz
+ </jreLinuxUrl>
+ <dist>${project.build.directory}/dist</dist>
+ </properties>
+ <repositories>
+ <repository>
+ <id>resplat-public-mvn-repo</id>
+ <name>ResPlat Public Maven Repository</name>
+ <url>https://gitlab.unimelb.edu.au/resplat-mediaflux/mvn-repo/raw/master</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>com.arcitecta</groupId>
+ <artifactId>mfclient</artifactId>
+ <version>4.9.079</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>3.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>download-mexplorer</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>download-single</goal>
+ </goals>
+ <configuration>
+ <url>https://gitlab.unimelb.edu.au</url>
+ <fromFile>
+ /resplat-mediaflux/releases/raw/master/mediaflux/mexplorer-${mexplorer.version}.jar
+ </fromFile>
+ <toFile>${project.build.directory}/mexplorer.jar</toFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <!-- <mainClass>unimelb.mf.client.ssh.cli.SCPPutCLI</mainClass> -->
+ </manifest>
+ <manifestEntries>
+ <App-Version>${project.version}</App-Version>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>make-zip</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/make-zip.xml</descriptor>
+ </descriptors>
+ <archiverConfig>
+ <directoryMode>0755</directoryMode>
+ <defaultDirectoryMode>0755</defaultDirectoryMode>
+ <fileMode>0644</fileMode>
+ </archiverConfig>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>platform-packages</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>prepare-resources</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <mkdir
+ dir="${project.build.directory}/classes/unimelb/mf/client" />
+ <copy
+ file="${project.basedir}/src/main/resources/unimelb/mf/client/app.properties"
+ tofile="${project.build.directory}/classes/unimelb/mf/client/app.properties" />
+ <replace
+ file="${project.build.directory}/classes/unimelb/mf/client/app.properties"
+ token="@VERSION@" value="${project.version}" />
+ <replace
+ file="${project.build.directory}/classes/unimelb/mf/client/app.properties"
+ token="@BUILD_TIME@" value="${maven.build.timestamp}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <!-- Initialisation -->
+ <tstamp />
+ <delete dir="${dist}" />
+ <mkdir dir="${dist}" />
- <!-- Mac OS package -->
- <echo
- message="building Mac OS package with 64 bit Java 8 Runtime..."/>
+ <!-- Mac OS package -->
+ <echo
+ message="building Mac OS package with 64 bit Java 8 Runtime..." />
- <mkdir dir="${dist}/mac"/>
- <mkdir dir="${dist}/mac/temp"/>
- <mkdir
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}"/>
- <mkdir
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin"/>
- <mkdir
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"/>
- <mkdir
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib"/>
- <copy
- file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
- tofile="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar"/>
- <copy file="${project.build.directory}/mexplorer.jar"
- tofile="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar"/>
- <copy
- todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
- <fileset dir="${project.basedir}/src/main/config"/>
- </copy>
- <copy
- todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix">
- <fileset dir="${project.basedir}/src/main/scripts/unix"/>
- </copy>
- <exec executable="curl" dir="${dist}/mac">
- <arg value="-L"/>
- <arg value="-O"/>
- <arg value="-H"/>
- <arg
- value="Cookie: oraclelicense=accept-securebackup-cookie"/>
- <arg value="-k"/>
- <arg value="${jreMacUrl}"/>
- </exec>
- <untar src="${dist}/mac/${jreMacFile}"
- dest="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
- compression="gzip"/>
- <dirset
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
- id="macJreDirId">
- <include name="openjdk-*-jre*"/>
- </dirset>
- <property name="macJreDir" refid="macJreDirId"/>
- <property name="macJavaHome"
- value="${macJreDir}"/>
- <replace
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="@JAVA_HOME@" value="${macJavaHome}"/>
- <replace
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="#export JAVA_HOME=" value="export JAVA_HOME="/>
- <replace
- dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="#export PATH=" value="export PATH="/>
- <zip
- destfile="${dist}/mac/unimelb-mf-clients-${project.version}-mac-x64.zip">
- <zipfileset dir="${dist}/mac/temp" filemode="755"/>
- </zip>
- <delete dir="${dist}/mac/temp"/>
- <delete file="${dist}/mac/${jreMacFile}"/>
+ <mkdir dir="${dist}/mac" />
+ <mkdir dir="${dist}/mac/temp" />
+ <mkdir
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}" />
+ <mkdir
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin" />
+ <mkdir
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix" />
+ <mkdir
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib" />
+ <copy
+ file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
+ tofile="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar" />
+ <copy file="${project.build.directory}/mexplorer.jar"
+ tofile="${dist}/mac/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar" />
+ <copy
+ todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
+ <fileset dir="${project.basedir}/src/main/config" />
+ </copy>
+ <copy
+ todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix">
+ <fileset
+ dir="${project.basedir}/src/main/scripts/unix" />
+ </copy>
+ <exec executable="curl" dir="${dist}/mac">
+ <arg value="-L" />
+ <arg value="-O" />
+ <arg value="-H" />
+ <arg
+ value="Cookie: oraclelicense=accept-securebackup-cookie" />
+ <arg value="-k" />
+ <arg value="${jreMacUrl}" />
+ </exec>
+ <untar src="${dist}/mac/${jreMacFile}"
+ dest="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
+ compression="gzip" />
+ <dirset
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}"
+ id="macJreDirId">
+ <include name="openjdk-*-jre*" />
+ </dirset>
+ <property name="macJreDir" refid="macJreDirId" />
+ <property name="macJavaHome" value="${macJreDir}" />
+ <replace
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="@JAVA_HOME@" value="${macJavaHome}" />
+ <replace
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="#export JAVA_HOME=" value="export JAVA_HOME=" />
+ <replace
+ dir="${dist}/mac/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="#export PATH=" value="export PATH=" />
+ <zip
+ destfile="${dist}/mac/unimelb-mf-clients-${project.version}-mac-x64.zip">
+ <zipfileset dir="${dist}/mac/temp" filemode="755" />
+ </zip>
+ <delete dir="${dist}/mac/temp" />
+ <delete file="${dist}/mac/${jreMacFile}" />
- <!-- Windows package -->
- <echo
- message="building Windows package with 64 bit Java 8 Runtime..."/>
- <mkdir dir="${dist}/windows"/>
- <mkdir dir="${dist}/windows/temp"/>
- <mkdir
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}"/>
- <mkdir
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin"/>
- <mkdir
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"/>
- <mkdir
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib"/>
- <copy
- file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
- tofile="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar"/>
- <copy file="${project.build.directory}/mexplorer.jar"
- tofile="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar"/>
- <copy
- todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
- <fileset dir="${project.basedir}/src/main/config"/>
- </copy>
- <copy
- todir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows">
- <fileset
- dir="${project.basedir}/src/main/scripts/windows"/>
- </copy>
- <exec executable="curl" dir="${dist}/windows">
- <arg value="-L"/>
- <arg value="-O"/>
- <arg value="-H"/>
- <arg
- value="Cookie: oraclelicense=accept-securebackup-cookie"/>
- <arg value="-k"/>
- <arg value="${jreWindowsUrl}"/>
- </exec>
- <unzip src="${dist}/windows/${jreWindowsFile}"
- dest="${dist}/windows/temp/unimelb-mf-clients-${project.version}"/>
- <dirset
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}"
- id="winJreDirId">
- <include name="openjdk-*-jre*"/>
- </dirset>
- <property name="winJreDir" refid="winJreDirId"/>
- <property name="winJavaHome" value="${winJreDir}"/>
- <replace
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
- token="@JAVA_HOME@" value="${winJavaHome}"/>
- <replace
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
- token="@REM set JAVA_HOME=" value="set JAVA_HOME="/>
- <replace
- dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
- token="@REM set PATH=" value="set PATH="/>
- <zip
- destfile="${dist}/windows/unimelb-mf-clients-${project.version}-windows-x64.zip">
- <zipfileset dir="${dist}/windows/temp"
- filemode="755"/>
- </zip>
- <delete dir="${dist}/windows/temp"/>
- <delete file="${dist}/windows/${jreWindowsFile}"/>
+ <!-- Windows package -->
+ <echo
+ message="building Windows package with 64 bit Java 8 Runtime..." />
+ <mkdir dir="${dist}/windows" />
+ <mkdir dir="${dist}/windows/temp" />
+ <mkdir
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}" />
+ <mkdir
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin" />
+ <mkdir
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows" />
+ <mkdir
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib" />
+ <copy
+ file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
+ tofile="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar" />
+ <copy file="${project.build.directory}/mexplorer.jar"
+ tofile="${dist}/windows/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar" />
+ <copy
+ todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
+ <fileset dir="${project.basedir}/src/main/config" />
+ </copy>
+ <copy
+ todir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows">
+ <fileset
+ dir="${project.basedir}/src/main/scripts/windows" />
+ </copy>
+ <exec executable="curl" dir="${dist}/windows">
+ <arg value="-L" />
+ <arg value="-O" />
+ <arg value="-H" />
+ <arg
+ value="Cookie: oraclelicense=accept-securebackup-cookie" />
+ <arg value="-k" />
+ <arg value="${jreWindowsUrl}" />
+ </exec>
+ <unzip src="${dist}/windows/${jreWindowsFile}"
+ dest="${dist}/windows/temp/unimelb-mf-clients-${project.version}" />
+ <dirset
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}"
+ id="winJreDirId">
+ <include name="openjdk-*-jre*" />
+ </dirset>
+ <property name="winJreDir" refid="winJreDirId" />
+ <property name="winJavaHome" value="${winJreDir}" />
+ <replace
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
+ token="@JAVA_HOME@" value="${winJavaHome}" />
+ <replace
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
+ token="@REM set JAVA_HOME=" value="set JAVA_HOME=" />
+ <replace
+ dir="${dist}/windows/temp/unimelb-mf-clients-${project.version}/bin/windows"
+ token="@REM set PATH=" value="set PATH=" />
+ <zip
+ destfile="${dist}/windows/unimelb-mf-clients-${project.version}-windows-x64.zip">
+ <zipfileset dir="${dist}/windows/temp"
+ filemode="755" />
+ </zip>
+ <delete dir="${dist}/windows/temp" />
+ <delete file="${dist}/windows/${jreWindowsFile}" />
- <!-- Linux package -->
- <echo
- message="building Linux package with 64 bit Java 8 Runtime..."/>
+ <!-- Linux package -->
+ <echo
+ message="building Linux package with 64 bit Java 8 Runtime..." />
- <mkdir dir="${dist}/linux"/>
- <mkdir dir="${dist}/linux/temp"/>
- <mkdir
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}"/>
- <mkdir
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin"/>
- <mkdir
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"/>
- <mkdir
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib"/>
- <copy
- file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
- tofile="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar"/>
- <copy file="${project.build.directory}/mexplorer.jar"
- tofile="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar"/>
- <copy
- todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
- <fileset dir="${project.basedir}/src/main/config"/>
- </copy>
- <copy
- todir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix">
- <fileset dir="${project.basedir}/src/main/scripts/unix"/>
- </copy>
- <exec executable="curl" dir="${dist}/linux">
- <arg value="-L"/>
- <arg value="-O"/>
- <arg value="-H"/>
- <arg
- value="Cookie: oraclelicense=accept-securebackup-cookie"/>
- <arg value="-k"/>
- <arg value="${jreLinuxUrl}"/>
- </exec>
- <untar src="${dist}/linux/${jreLinuxFile}"
- dest="${dist}/linux/temp/unimelb-mf-clients-${project.version}"
- compression="gzip"/>
- <dirset
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}"
- id="linuxJreDirId">
- <include name="openjdk-*-jre*"/>
- </dirset>
- <property name="linuxJreDir" refid="linuxJreDirId"/>
- <property name="linuxJavaHome" value="${linuxJreDir}"/>
- <replace
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="@JAVA_HOME@" value="${linuxJavaHome}"/>
- <replace
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="#export JAVA_HOME=" value="export JAVA_HOME="/>
- <replace
- dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
- token="#export PATH=" value="export PATH="/>
- <zip
- destfile="${dist}/linux/unimelb-mf-clients-${project.version}-linux-x64.zip">
- <zipfileset dir="${dist}/linux/temp" filemode="755"/>
- </zip>
- <delete dir="${dist}/linux/temp"/>
- <delete file="${dist}/linux/${jreLinuxFile}"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.8,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
+ <mkdir dir="${dist}/linux" />
+ <mkdir dir="${dist}/linux/temp" />
+ <mkdir
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}" />
+ <mkdir
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin" />
+ <mkdir
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix" />
+ <mkdir
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib" />
+ <copy
+ file="${project.build.directory}/unimelb-mf-clients-${project.version}-jar-with-dependencies.jar"
+ tofile="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib/unimelb-mf-clients.jar" />
+ <copy file="${project.build.directory}/mexplorer.jar"
+ tofile="${dist}/linux/temp/unimelb-mf-clients-${project.version}/lib/mexplorer.jar" />
+ <copy
+ todir="${dist}/mac/temp/unimelb-mf-clients-${project.version}">
+ <fileset dir="${project.basedir}/src/main/config" />
+ </copy>
+ <copy
+ todir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix">
+ <fileset
+ dir="${project.basedir}/src/main/scripts/unix" />
+ </copy>
+ <exec executable="curl" dir="${dist}/linux">
+ <arg value="-L" />
+ <arg value="-O" />
+ <arg value="-H" />
+ <arg
+ value="Cookie: oraclelicense=accept-securebackup-cookie" />
+ <arg value="-k" />
+ <arg value="${jreLinuxUrl}" />
+ </exec>
+ <untar src="${dist}/linux/${jreLinuxFile}"
+ dest="${dist}/linux/temp/unimelb-mf-clients-${project.version}"
+ compression="gzip" />
+ <dirset
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}"
+ id="linuxJreDirId">
+ <include name="openjdk-*-jre*" />
+ </dirset>
+ <property name="linuxJreDir" refid="linuxJreDirId" />
+ <property name="linuxJavaHome" value="${linuxJreDir}" />
+ <replace
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="@JAVA_HOME@" value="${linuxJavaHome}" />
+ <replace
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="#export JAVA_HOME=" value="export JAVA_HOME=" />
+ <replace
+ dir="${dist}/linux/temp/unimelb-mf-clients-${project.version}/bin/unix"
+ token="#export PATH=" value="export PATH=" />
+ <zip
+ destfile="${dist}/linux/unimelb-mf-clients-${project.version}-linux-x64.zip">
+ <zipfileset dir="${dist}/linux/temp"
+ filemode="755" />
+ </zip>
+ <delete dir="${dist}/linux/temp" />
+ <delete file="${dist}/linux/${jreLinuxFile}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.8,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/src/main/scripts/unix/mexplorer b/src/main/scripts/unix/mexplorer
deleted file mode 100755
index 3aeb939ee73d3d84ddf74c29da4aaeda17f7fa97..0000000000000000000000000000000000000000
--- a/src/main/scripts/unix/mexplorer
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# ${ROOT}/bin/
-BIN=$(dirname ${BASH_SOURCE[0]})
-
-# current directory
-CWD=$(pwd)
-
-# ${ROOT}/
-ROOT=$(cd ${BIN}/../../ && pwd && cd ${CWD})
-
-# ${ROOT}/lib/
-LIB=${ROOT}/lib
-
-# ${ROOT}/lib/mexplorer.jar
-JAR=${LIB}/mexplorer.jar
-
-# check if mexplorer.jar exists
-[[ ! -f $JAR ]] && echo "Error: cannot find ${JAR}." >&2 && exit 2
-
-#export JAVA_HOME=${ROOT}/@JAVA_HOME@
-#export PATH=${JAVA_HOME}/bin:${PATH}
-
-# check if java exists
-[[ -z $(which java) ]] && echo "Error: cannot find java." 1>&2 && exit 1
-
-#
-java -Xmx1024m -jar ${JAR}
-
diff --git a/src/main/scripts/windows/mexplorer.cmd b/src/main/scripts/windows/mexplorer.cmd
deleted file mode 100755
index d47d16ed3b16ec664d40039550f0f04e2d6b248f..0000000000000000000000000000000000000000
--- a/src/main/scripts/windows/mexplorer.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-pushd %~dp0..\..\
-set ROOT=%cd%
-popd
-
-@REM set JAVA_HOME=%ROOT%\@JAVA_HOME@
-@REM set PATH=%JAVA_HOME%\bin;%PATH%
-
-set JAR=%ROOT%\lib\mexplorer.jar
-
-java -Xmx1024m -jar "%JAR%" %*