Merge pull request #181 from apigee/Issue178

Proxy settings

Author: ssvaidyanathan

README.md

@@ -38,6 +38,7 @@ Learn more, check out this video! [Ask the Expert](https://www.youtube.com/watch
   - [pom.xml Sample](#pom-xml-sample)
   - [Config.json Sample](#config-json-sample)
 - [Commands](#commands-for-deploying-the-proxy-using-maven)
+- [To configure a proxy](#to-configure-a-proxy)
 
 # Prerequisites
 You will need the following to run the samples:
@@ -296,6 +297,11 @@ The [samples](./samples/security-sharedflow/src/sharedflows) has an example of a
 
 This is required to differentiate the build and deployment process.
 
+## To configure a proxy 
+Supported from v2.3.0
+
+Please refer to this [doc](http://maven.apache.org/guides/mini/guide-proxies.html) that explains how to setup proxy settings in your settings.xml usually in your $HOME/.m2 directory. Only `https` protocol is supported
+
 ------------------------------------------
 Recommended Convention for Contributions
 ------------------------------------------

pom.xml

@@ -19,7 +19,7 @@
 	<packaging>maven-plugin</packaging>
 	<!-- This is inherited from <version>0.0.15</version> of the the non-opensource 
 		plugin -->
-	<version>2.2.3-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<name>apigee-edge-maven-plugin maven mojo</name>
 	<url>http://maven.apache.org</url>
 
@@ -67,9 +67,11 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>4.3.20.RELEASE</spring.version>
-		<spring.security.version>4.2.9.RELEASE</spring.security.version>
+		<spring.version>5.3.15</spring.version>
+		<spring.security.version>5.6.1</spring.security.version>
 		<log4j.version>2.17.1</log4j.version>
+		<maven.version>3.1.0</maven.version>
+		<maven.api.version>3.5</maven.api.version>
 	</properties>
 	<!-- mgmt-api-java-sdk -->
 
@@ -135,6 +137,23 @@
 			<artifactId>maven-plugin-api</artifactId>
 			<version>2.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>${maven.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-core</artifactId>
+			<version>${maven.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<version>${maven.api.version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- using google http client for http rest protocols. supposed to be better 
 			than all -->

samples/mockapi-recommended/src/gateway/shared-pom.xml

@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>io.apigee.build-tools.enterprise4g</groupId>
                 <artifactId>apigee-edge-maven-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.3.0</version>
                 <executions>
                     <execution>
                         <id>configure-bundle</id>
@@ -104,7 +104,7 @@
                 <apigee.org>${org}</apigee.org>
                 <apigee.env>${env}</apigee.env>
                 <apigee.authtype>oauth</apigee.authtype> <!-- only option -->
-                <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->
+                <apigee.bearer>${bearer}</apigee.bearer> <!-- this takes precedence over service account file -->                
                 <apigee.serviceaccount.file>${file}</apigee.serviceaccount.file>
                 <apigee.options>override</apigee.options> <!-- override is default. Other options are async|clean-->
                 <apigee.googletoken.email>${googleTokenEmail}</apigee.googletoken.email> <!-- Available in Apigee X and Apigee hybrid 1.6 + -->

samples/security-sharedflow/src/sharedflows/parent-sharedflow-pom.xml

@@ -73,7 +73,7 @@
             <plugin>
                 <groupId>io.apigee.build-tools.enterprise4g</groupId>
                 <artifactId>apigee-edge-maven-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.3.0</version>
                 <executions>
                     <execution>
                         <id>configure-bundle</id>

src/main/java/io/apigee/buildTools/enterprise4g/mavenplugin/DeployMojo.java

@@ -146,7 +146,8 @@ protected void doImport() throws IOException, MojoFailureException,Exception {
 
 			logger.info("\n\n=============Importing App================\n\n");
 			state = State.IMPORTING;
-			bundleRevision = RestUtil.uploadBundle(super.getProfile(), super.getApplicationBundlePath());
+			RestUtil restUtil = new RestUtil(super.getProfile());
+			bundleRevision = restUtil.uploadBundle(super.getProfile(), super.getApplicationBundlePath());
 
 
 		} catch (IOException e) {
@@ -165,7 +166,8 @@ protected void doUpdate(String revision) throws IOException, MojoFailureExceptio
 
 			logger.info("\n\n=============Updating App================\n\n");
 			state = State.IMPORTING;
-			bundleRevision = RestUtil.updateBundle(super.getProfile(), super.getApplicationBundlePath(),revision);
+			RestUtil restUtil = new RestUtil(super.getProfile());
+			bundleRevision = restUtil.updateBundle(super.getProfile(), super.getApplicationBundlePath(),revision);
 
 		} catch (IOException e) {
 			throw e;
@@ -185,7 +187,8 @@ public void doDeactivae() throws IOException, MojoFailureException,Exception {
 		try {
 			logger.info("\n\n=============Deactivating App================\n\n");
 			state = State.DEACTIVATING;
-			RestUtil.deactivateBundle(super.getProfile());
+			RestUtil restUtil = new RestUtil(super.getProfile());
+			restUtil.deactivateBundle(super.getProfile());
 		}
 		catch (IOException e) {
 				throw e ;	
@@ -204,7 +207,8 @@ public void doRefreshBundle()  throws IOException, MojoFailureException{
 		try {
 			logger.info("\n\n=============Refresh Bundle================\n\n");
 			state = State.ACTIVATING;
-			RestUtil.refreshBundle(super.getProfile(), this.bundleRevision);
+			RestUtil restUtil = new RestUtil(super.getProfile());
+			restUtil.refreshBundle(super.getProfile(), this.bundleRevision);
 		} catch (IOException e) {
 			throw e ;
 		} catch (RuntimeException e) {
@@ -222,7 +226,8 @@ public void doActivateBundle()  throws IOException, MojoFailureException, Interr
 		try {
 			logger.info("\n\n=============Activating Bundle================\n\n");
 			state = State.ACTIVATING;
-			String revision = RestUtil.activateBundleRevision(super.getProfile(), this.bundleRevision);
+			RestUtil restUtil = new RestUtil(super.getProfile());
+			String revision = restUtil.activateBundleRevision(super.getProfile(), this.bundleRevision);
 
 			// if user passed -Dapigee.options=async, no need for polling, exit early
 			if (Options.async) {
@@ -232,7 +237,7 @@ public void doActivateBundle()  throws IOException, MojoFailureException, Interr
 			boolean deployed = false;
 			//Loop to check the deployment status
 			for (; !deployed; ) {
-				deployed = RestUtil.getDeploymentStateForRevision(super.getProfile(), revision);
+				deployed = restUtil.getDeploymentStateForRevision(super.getProfile(), revision);
 	        	Thread.sleep(5*1000);
 			}
 		} catch (IOException e) {
@@ -249,14 +254,15 @@ public void doActivateBundle()  throws IOException, MojoFailureException, Interr
 
 	public void doDelete() throws IOException, MojoFailureException,Exception {
 	try {
-			String status = RestUtil.deactivateBundle(this.getProfile());
+			RestUtil restUtil = new RestUtil(this.getProfile());
+			String status = restUtil.deactivateBundle(this.getProfile());
 			if(status == null) {
 				logger.info("No bundle to delete");
 				return;
 			}
 			logger.info("\n\n=============Deleting bundle================\n\n");
 			state = State.DELETING;
-			RestUtil.deleteBundle(this.getProfile());
+			restUtil.deleteBundle(this.getProfile());
 		} catch (IOException e) {
 			throw e ;
 		} catch (RuntimeException e) {