diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5967073..0d1cfc7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Create GitHub Release uses: softprops/action-gh-release@v2 with: - tag_name: Datapower26 + tag_name: Datapower27 files: | dist/*.zip dist/*.jar diff --git a/.gitignore b/.gitignore index a83be04..b2150b8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ /target/ /schemas/ +.DS_Store +.idea/ +src/datapower-configuration-manager.iml +src/main/main.iml diff --git a/README.md b/README.md index 71f06c6..dd3bc22 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Deploy (UCD). ## Prerequisites * JDK 1.6 or later is required to build. An equivalent JRE is supported if using a prebuilt plugin. -* Apache Ant (1.8.1 or later, 1.9.9 will be packaged with UCD plugin) +* Apache Ant (1.8.1 or later, 1.9.15 will be packaged with UCD plugin) ## Building diff --git a/build.xml b/build.xml index 413e886..78f6a72 100644 --- a/build.xml +++ b/build.xml @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/src/main/zip/RunDeployDotAnt.groovy b/src/main/zip/RunDeployDotAnt.groovy index 2ff3a53..dcb7c4d 100644 --- a/src/main/zip/RunDeployDotAnt.groovy +++ b/src/main/zip/RunDeployDotAnt.groovy @@ -54,7 +54,7 @@ try def ch = new CommandHelper(new File('.')) def dcmDir = ch.getProcessBuilder().environment().get('PLUGIN_HOME') + '/dcm' - def anthome = dcmDir + '/apache-ant-1.9.9/' + def anthome = dcmDir + '/apache-ant-1.9.15/' ch.addEnvironmentVariable('ANT_HOME', anthome) // Get ANT_OPTS environment variable diff --git a/src/main/zip/info.xml b/src/main/zip/info.xml index f263576..f781b96 100644 --- a/src/main/zip/info.xml +++ b/src/main/zip/info.xml @@ -200,5 +200,13 @@ Added "upload directory" step a a duplicate step to "upload files" to avoid confusion for a users. + + DataPower plugin is now bundled with Ant v1.9.15due to CVEs. + Removed vulnerability: CVE-2022-34169 + Removed vulnerability: sonatype-2018-0330 + Removed vulnerability: CVE-2020-1945 + Removed vulnerability: CVE-2021-36373 + Removed vulnerability: CVE-2022-34169 + diff --git a/src/main/zip/plugin.xml b/src/main/zip/plugin.xml index 0ce5ea0..9fd5e92 100644 --- a/src/main/zip/plugin.xml +++ b/src/main/zip/plugin.xml @@ -19,7 +19,7 @@
- + The IBM WebSphere DataPower plugin deploys DataPower services. Infrastructure/WebSphere DataPower
diff --git a/src/main/zip/upgrade.xml b/src/main/zip/upgrade.xml index 09885b1..5573f1f 100644 --- a/src/main/zip/upgrade.xml +++ b/src/main/zip/upgrade.xml @@ -597,5 +597,7 @@ + +