From f10852e311ea03c3b7c04df6d26e5b49c218b462 Mon Sep 17 00:00:00 2001
From: Sai Saran Vaidyanathan <ssvaidyanathan@google.com>
Date: Sat, 5 Nov 2022 11:28:27 -0700
Subject: [PATCH] fix for #161

---
 samples/APIandConfig/shared-pom.xml                             | 2 +-
 samples/EdgeConfig/shared-pom.xml                               | 2 +-
 .../com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/APIandConfig/shared-pom.xml b/samples/APIandConfig/shared-pom.xml
index 657102a..4fc4bfd 100644
--- a/samples/APIandConfig/shared-pom.xml
+++ b/samples/APIandConfig/shared-pom.xml
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>com.apigee.edge.config</groupId>
                 <artifactId>apigee-config-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.4</version>
                 <executions>
                     <execution>
                         <id>create-config-targetserver</id>
diff --git a/samples/EdgeConfig/shared-pom.xml b/samples/EdgeConfig/shared-pom.xml
index 535da83..d81c928 100644
--- a/samples/EdgeConfig/shared-pom.xml
+++ b/samples/EdgeConfig/shared-pom.xml
@@ -26,7 +26,7 @@
             <plugin>
                 <groupId>com.apigee.edge.config</groupId>
                 <artifactId>apigee-config-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.4.4</version>
                 <executions>
                     <execution>
                         <id>create-config-targetserver</id>
diff --git a/src/main/java/com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java b/src/main/java/com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java
index 25b8b54..3bfe1e5 100644
--- a/src/main/java/com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java
+++ b/src/main/java/com/apigee/edge/config/mavenplugin/GatewayAbstractMojo.java
@@ -355,11 +355,11 @@ public ServerProfile getProfile() {
 				CredentialsProvider credsProvider = new BasicCredentialsProvider();
 				credsProvider.setCredentials(new AuthScope(mavenProxy.getHost(), mavenProxy.getPort()), 
 						new UsernamePasswordCredentials(mavenProxy.getUsername(), mavenProxy.getPassword()));
-				builder.setProxy(proxy);
 				builder.setDefaultCredentialsProvider(credsProvider);
 				buildProfile.setProxyUsername(mavenProxy.getUsername());
 				buildProfile.setProxyPassword(mavenProxy.getPassword());
 			}
+			builder.setProxy(proxy);
 			buildProfile.setApacheHttpClient(builder.build());
 			
 			//Set Proxy configurations