Use additional sources from maven instead of hard-coded paths
Change-Id: I3f59b553d43f52e6ec98a14a93e0898f86e3cdd0
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Reviewed-on: https://git.eclipse.org/r/135470
diff --git a/flatpak/platform/pom.xml b/flatpak/platform/pom.xml
index 2f7cdfb..f3005de 100644
--- a/flatpak/platform/pom.xml
+++ b/flatpak/platform/pom.xml
@@ -84,21 +84,35 @@
<screenshot>https://raw.githubusercontent.com/mbooth101/org.eclipse.linuxtools.eclipse-build/master/flatpak/platform/screenshots/screenshot-workbench.png</screenshot>
</screenshots>
<branch>master</branch>
- <runtimeVersion>3.30</runtimeVersion>
+ <runtime>org.gnome.Sdk</runtime>
<source>${project.build.directory}/products/org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz</source>
<continueOnFail>true</continueOnFail>
<sign>true</sign>
<additionalSources>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.jar</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </artifact>
<destination>/app/eclipse/flatpak-dev-shim.jar</destination>
</additionalSource>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.so</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>so</type>
+ </artifact>
<destination>/app/jdk/lib/libflatpakdevshim.so</destination>
</additionalSource>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.exe</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>exe</type>
+ </artifact>
<destination>/app/bin/hostcommandrunner</destination>
<permissions>755</permissions>
</additionalSource>
diff --git a/flatpak/sdk/pom.xml b/flatpak/sdk/pom.xml
index 8e45f17..da7f43a 100644
--- a/flatpak/sdk/pom.xml
+++ b/flatpak/sdk/pom.xml
@@ -88,21 +88,35 @@
<screenshot>https://raw.githubusercontent.com/mbooth101/org.eclipse.linuxtools.eclipse-build/master/flatpak/platform/screenshots/screenshot-pde.png</screenshot>
</screenshots>
<branch>master</branch>
- <runtimeVersion>3.30</runtimeVersion>
+ <runtime>org.gnome.Sdk</runtime>
<source>${project.build.directory}/products/org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz</source>
<continueOnFail>true</continueOnFail>
<sign>true</sign>
<additionalSources>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.jar</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </artifact>
<destination>/app/eclipse/flatpak-dev-shim.jar</destination>
</additionalSource>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.so</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>so</type>
+ </artifact>
<destination>/app/jdk/lib/libflatpakdevshim.so</destination>
</additionalSource>
<additionalSource>
- <source>${user.home}/.m2/repository/org/eclipse/flatpak/flatpak-dev-shim/0.0.1-SNAPSHOT/flatpak-dev-shim-0.0.1-SNAPSHOT.exe</source>
+ <artifact>
+ <artifactId>flatpak-dev-shim</artifactId>
+ <groupId>org.eclipse.flatpak</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <type>exe</type>
+ </artifact>
<destination>/app/bin/hostcommandrunner</destination>
<permissions>755</permissions>
</additionalSource>