Merge release 1.2.1 (#65)

* Add install instructions * ID-64: update versions of dependencies
Axway-API-Management-Plus · Feb 20, 2024 · 6a8ceda · 6a8ceda
1 parent dab69b0
commit 6a8ceda
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -1,5 +1,14 @@
 = Changelog
 
+== Version 1.2.1
+[cols="1,2,<10a", options="header"]
+|===
+|ID|Type|Description
+|https://github.com/Axway-API-Management-Plus/apigw-maven-plugin/issues/64[#64]
+|Bug Fix
+|Update versions of dependencies.
+|===
+
 == Version 1.2.0
 [cols="1,2,<10a", options="header"]
 |===

diff --git a/doc/getting-started/getting-started.adoc b/doc/getting-started/getting-started.adoc
@@ -5,7 +5,7 @@
 :sectnums:
 :source-highlighter: prettify
 
-:mvn-plugin-ver: 1.2.0.1
+:mvn-plugin-ver: 1.2.1
 
 Here you get a simple introduction on how to use the _Maven Plugin for Axway API Gateway_.
 It assumes that you are familiar with https://maven.apache.org[Apache Maven] and that you are familiar with PolicyStudio and the API Gateway.

diff --git a/doc/manual/user-guide.adoc b/doc/manual/user-guide.adoc
@@ -1,7 +1,7 @@
 = Maven Plugin for API Gateway Policy Development: User Guide
 :Author: Martin Look
 :Email: [email protected]
-:revnumber: 1.2.0.1
+:revnumber: 1.2.1
 :toc:
 :sectnums:
 :source-highlighter: prettify

diff --git a/example/getting-started/pom.xml b/example/getting-started/pom.xml
@@ -7,7 +7,7 @@
   <packaging>pom</packaging>
 
   <properties>
-      <axway.maven.plugin.ver>1.2.0.1</axway.maven.plugin.ver>
+      <axway.maven.plugin.ver>1.2.1</axway.maven.plugin.ver>
   </properties>
 
   <modules>

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
 	<groupId>com.axway.maven.plugins</groupId>
 	<artifactId>apigw-maven-plugin</artifactId>
-	<version>1.2.0.1</version>
+	<version>1.2.1</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>Axway API Gateway Maven Plugin</name>
@@ -64,7 +64,12 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 
-		<jackson.version>[2.9.9.1,)</jackson.version>
+		<maven.core.version>3.8.1</maven.core.version>
+		<maven-plugin-tools.version>3.10.2</maven-plugin-tools.version>		
+
+		<commons-text.version>1.11.0</commons-text.version>
+		<jackson.version>2.16.1</jackson.version>
+		<plexus-archiver.version>4.8.0</plexus-archiver.version>
 
 		<maven.wagon.http.pool>false</maven.wagon.http.pool>
 	</properties>
@@ -73,38 +78,29 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-core</artifactId>
-			<version>3.8.1</version>
+			<version>${maven.core.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
-			<version>3.6.0</version>
+			<version>3.0</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.6.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-archiver</artifactId>
-			<version>3.3.0</version>
+			<version>${maven-plugin-tools.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-dependency-plugin</artifactId>
-			<version>3.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>3.2.0</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>${commons-text.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
+			<version>${plexus-archiver.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -130,7 +126,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>${maven-plugin-tools.version}</version>
 				<configuration>
 					<goalPrefix>apigw</goalPrefix>
 					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>

diff --git a/src/main/java/com/axway/maven/apigw/InitMojo.java b/src/main/java/com/axway/maven/apigw/InitMojo.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -106,7 +106,7 @@ protected void createProjectFile(File dir, String projectName) throws MojoExecut
 			StringBuilder xml = new StringBuilder();
 			xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 			xml.append("<projectDescription>\n");
-			xml.append("  <name>").append(StringEscapeUtils.escapeXml(projectName)).append("</name>\n");
+			xml.append("  <name>").append(StringEscapeUtils.escapeXml11(projectName)).append("</name>\n");
 			xml.append("  <comment/>\n");
 			xml.append("  <projects/>\n");
 			xml.append("  <buildSpec/>\n");

diff --git a/src/main/java/com/axway/maven/apigw/PolicyStudioMojo.java b/src/main/java/com/axway/maven/apigw/PolicyStudioMojo.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Execute;
@@ -91,12 +91,12 @@ private void generateProjectConnectionFile() throws MojoExecutionException {
 			xml.append("<root>");
 			xml.append("<files>");
 			xml.append("<file location=\"")
-					.append(StringEscapeUtils.escapeXml(getPoliciesDirectory().getAbsolutePath())).append("\" url=\"")
-					.append(StringEscapeUtils.escapeXml(buildProjectName())).append("\"/>");
+					.append(StringEscapeUtils.escapeXml11(getPoliciesDirectory().getAbsolutePath())).append("\" url=\"")
+					.append(StringEscapeUtils.escapeXml11(buildProjectName())).append("\"/>");
 			if (getPackageType() == PackageType.POLICY && this.testServerDirectory.exists()) {
 				xml.append("<file location=\"")
-						.append(StringEscapeUtils.escapeXml(this.testServerDirectory.getAbsolutePath()))
-						.append("\" url=\"").append(StringEscapeUtils.escapeXml(TEST_SERVER_PROJECT_NAME))
+						.append(StringEscapeUtils.escapeXml11(this.testServerDirectory.getAbsolutePath()))
+						.append("\" url=\"").append(StringEscapeUtils.escapeXml11(TEST_SERVER_PROJECT_NAME))
 						.append("\"/>");
 			}
 			xml.append("</files>");