fixing build files needed for this release

unigrid-project · Aug 29, 2022 · c1c4894 · c1c4894
1 parent 57ee30a
commit c1c4894
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/...g/UpdateWalletConfig/src/main/java/org/unigrid/updatewalletconfig/UpdateWalletConfig.java b/...g/UpdateWalletConfig/src/main/java/org/unigrid/updatewalletconfig/UpdateWalletConfig.java
@@ -184,10 +184,6 @@ public static void main(String[] args) throws IOException {
 				.uri(mavenUrl("org.jboss.weld","weld-spi","4.0.SP1")).modulepath())
 			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/yasson-2.0.0-M1.jar")
 				.uri(mavenUrl("org.eclipse","yasson","2.0.0-M1")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/json-path-2.4.0.jar")
-				.uri(mavenUrl("com.jayway.jsonpath","json-path","2.4.0")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/jersey-media-jaxb-3.0.6.jar")
-				.uri(mavenUrl("org.glassfish.jersey.media","jersey-media-jaxb","3.0.6")).modulepath())
 			.file(FileMetadata.readFrom(homeDir + "/Downloads/" + linuxDaemon).uri(getDaemonUrl(OS.LINUX)))
 			.property("maven.central", MAVEN_BASE)
 			.property("default.launcher.main.class", "org.unigrid.janus.Janus")
@@ -330,10 +326,6 @@ public static void main(String[] args) throws IOException {
 				.uri(mavenUrl("org.jboss.weld","weld-spi","4.0.SP1")).modulepath())
 			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/yasson-2.0.0-M1.jar")
 				.uri(mavenUrl("org.eclipse","yasson","2.0.0-M1")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/json-path-2.4.0.jar")
-				.uri(mavenUrl("com.jayway.jsonpath","json-path","2.4.0")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/json-path-2.4.0.jar")
-				.uri(mavenUrl("org.glassfish.jersey.media","jersey-media-jaxb","3.0.5")).modulepath())
 			.file(FileMetadata.readFrom(homeDir + "/Downloads/" + windowsDaemon).uri(getDaemonUrl(OS.WINDOWS)))
 			.property("maven.central", MAVEN_BASE)
 			.property("default.launcher.main.class", "org.unigrid.janus.Janus")
@@ -475,10 +467,6 @@ public static void main(String[] args) throws IOException {
 				.uri(mavenUrl("org.jboss.weld","weld-spi","4.0.SP1")).modulepath())
 			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/yasson-2.0.0-M1.jar")
 				.uri(mavenUrl("org.eclipse","yasson","2.0.0-M1")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/json-path-2.4.0.jar")
-				.uri(mavenUrl("com.jayway.jsonpath","json-path","2.4.0")).modulepath())
-			.file(FileMetadata.readFrom("../../fx/target/jlink/cp/json-path-2.4.0.jar")
-				.uri(mavenUrl("org.glassfish.jersey.media","jersey-media-jaxb","3.0.5")).modulepath())
 			.file(FileMetadata.readFrom(homeDir + "/Downloads/" + osxDaemon).uri(getDaemonUrl(OS.MAC)))
 			.property("maven.central", MAVEN_BASE)
 			.property("default.launcher.main.class", "org.unigrid.janus.Janus")

diff --git a/fx/pom.xml b/fx/pom.xml
@@ -123,11 +123,6 @@
             <artifactId>jersey-media-json-binding</artifactId>
             <version>3.0.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-jaxb</artifactId>
-            <version>3.0.5</version>
-        </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-core</artifactId>
@@ -176,7 +171,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-jaxb</artifactId>
-            <version>3.0.6</version>
+            <version>3.0.5</version>
         </dependency>
         <!-- NEED TO ADD TO UpdateWalletConfig -->
     </dependencies>

diff --git a/fx/src/main/java/org/unigrid/janus/model/UpdateWallet.java b/fx/src/main/java/org/unigrid/janus/model/UpdateWallet.java
@@ -62,15 +62,15 @@ public class UpdateWallet extends TimerTask {
 
 	private final String linuxPath = System.getProperty("user.home").concat("/.unigrid/dependencies/temp/");
 	private final String macPath = System.getProperty("user.home")
-			.concat("/Library/Application\\ Support/UNIGRID/dependencies/temp/");
+		.concat("/Library/Application\\ Support/UNIGRID/dependencies/temp/");
 	private final String windowsPath = System.getProperty("user.home")
-			.concat("/AppData/Roaming/UNIGRID/dependencies/temp/");
+		.concat("/AppData/Roaming/UNIGRID/dependencies/temp/");
 
 	private static DebugService debug = new DebugService();
 	private static final String BASE_URL = "https://raw.githubusercontent.com/unigrid-project/unigrid-update/main/%s";
 	// private static PollingService polling = new PollingService();
 	private OS os = OS.CURRENT;
-	private static final Map<?, ?> OS_CONFIG = ArrayUtils.toMap(new Object[][] {
+	private static final Map<?, ?> OS_CONFIG = ArrayUtils.toMap(new Object[][]{
 		{OS.LINUX, "config-linux.xml"},
 		{OS.WINDOWS, "config-windows.xml"},
 		{OS.MAC, "config-mac.xml"}
@@ -155,12 +155,8 @@ public void run() {
 					}
 				}
 			});
-
-
 		} else */
 		if (checkUpdate()) {
-
-		} else if (checkUpdate()) {
 			this.pcs.firePropertyChange(this.UPDATE_PROPERTY, oldValue, UpdateState.UPDATE_READY);
 
 			Platform.runLater(new Runnable() {