From 81aabf4c0bec59e6a158045078f3c0ece971a2a2 Mon Sep 17 00:00:00 2001
From: Simon Stone <sstone1@uk.ibm.com>
Date: Wed, 16 Oct 2019 17:09:54 +0100
Subject: [PATCH] [FAB-16849] Various updates for Java version of FabCar

- Update .gitignore
- Use builds on Sonatype, not Nexus
- Enable new discovery as localhost flag

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ia0904cedf953b5ecbf6aaf859245a9bb431d3f76
---
 fabcar/java/.gitignore                                 |  4 +++-
 fabcar/java/pom.xml                                    | 10 +++++-----
 fabcar/java/src/main/java/org/example/ClientApp.java   |  4 ++++
 fabcar/java/src/main/java/org/example/EnrollAdmin.java |  4 ++++
 .../java/src/main/java/org/example/RegisterUser.java   |  4 ++++
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/fabcar/java/.gitignore b/fabcar/java/.gitignore
index 5fbd19f554..3aa04dcb13 100755
--- a/fabcar/java/.gitignore
+++ b/fabcar/java/.gitignore
@@ -2,4 +2,6 @@
 /target/
 .settings/
 .classpath
-.project
\ No newline at end of file
+.project
+wallet
+!wallet/.gitkeep
\ No newline at end of file
diff --git a/fabcar/java/pom.xml b/fabcar/java/pom.xml
index 37733b1bfa..01d1517981 100644
--- a/fabcar/java/pom.xml
+++ b/fabcar/java/pom.xml
@@ -19,16 +19,16 @@
    </build>
    <repositories>
       <repository>
-         <id>hyperledger</id>
-         <name>Hyperledger Nexus</name>
-         <url>https://nexus.hyperledger.org/content/repositories/snapshots</url>
+         <id>oss-sonatype</id>
+         <name>OSS Sonatype</name>
+         <url>https://oss.sonatype.org/content/repositories/snapshots</url>
       </repository>
    </repositories>
    <dependencies>
       <dependency>
-         <groupId>org.hyperledger.fabric-gateway-java</groupId>
+         <groupId>org.hyperledger.fabric</groupId>
          <artifactId>fabric-gateway-java</artifactId>
-         <version>1.4.0-SNAPSHOT</version>
+         <version>1.4.1-SNAPSHOT</version>
       </dependency>
       <dependency>
          <groupId>org.junit.platform</groupId>
diff --git a/fabcar/java/src/main/java/org/example/ClientApp.java b/fabcar/java/src/main/java/org/example/ClientApp.java
index c69f52beee..6589410af2 100755
--- a/fabcar/java/src/main/java/org/example/ClientApp.java
+++ b/fabcar/java/src/main/java/org/example/ClientApp.java
@@ -14,6 +14,10 @@
 
 public class ClientApp {
 
+	static {
+		System.setProperty("org.hyperledger.fabric.sdk.service_discovery.as_localhost", "true");
+	}
+
 	public static void main(String[] args) throws Exception {
 		// Load a file system based wallet for managing identities.
 		Path walletPath = Paths.get("wallet");
diff --git a/fabcar/java/src/main/java/org/example/EnrollAdmin.java b/fabcar/java/src/main/java/org/example/EnrollAdmin.java
index 4d4db12271..b9992de7a8 100644
--- a/fabcar/java/src/main/java/org/example/EnrollAdmin.java
+++ b/fabcar/java/src/main/java/org/example/EnrollAdmin.java
@@ -17,6 +17,10 @@
 
 public class EnrollAdmin {
 
+	static {
+		System.setProperty("org.hyperledger.fabric.sdk.service_discovery.as_localhost", "true");
+	}
+
 	public static void main(String[] args) throws Exception {
 
 		// Create a CA client for interacting with the CA.
diff --git a/fabcar/java/src/main/java/org/example/RegisterUser.java b/fabcar/java/src/main/java/org/example/RegisterUser.java
index d972a01be2..f892bef9b5 100644
--- a/fabcar/java/src/main/java/org/example/RegisterUser.java
+++ b/fabcar/java/src/main/java/org/example/RegisterUser.java
@@ -20,6 +20,10 @@
 
 public class RegisterUser {
 
+	static {
+		System.setProperty("org.hyperledger.fabric.sdk.service_discovery.as_localhost", "true");
+	}
+
 	public static void main(String[] args) throws Exception {
 
 		// Create a CA client for interacting with the CA.