Merge branch 'vmware:main' into feature/463-update-dependencies-to-la…

…test-package-versions

.github/workflows/build.yml

@@ -74,7 +74,7 @@ jobs:
 
       - name: Import GPG Key
         if: ${{ github.ref == 'refs/heads/main' }}
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -97,7 +97,7 @@ jobs:
           echo "MVN_BUILD_COMMAND=$MVN_BUILD_COMMAND" >> $GITHUB_ENV
  
       - name: Cache Maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/codeql-java.yml

@@ -46,7 +46,7 @@ jobs:
           languages: java
 
       - name: Cache Maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/super-linter.yml

@@ -16,13 +16,13 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java Action
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "21"
           distribution: "temurin"
 
       - name: Super-Linter
-        uses: github/super-linter@v5.0.0
+        uses: github/super-linter@v7
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: main

.node-version

@@ -0,0 +1 @@
+16.20.2

README.md

@@ -1,4 +1,4 @@
-# Build Tools for VMware Aria
+  # Build Tools for VMware Aria
 This repository contains the source code for the Build Tools for VMware Aria, formally knows as vRealize Build Tools.
 Build Tools for VMware Aria provides development and release management tools for implementing automation solutions based on the VMware Aria Suite (VMware Aria Automation, VMware Aria Automation Orchestrator, VMware Aria Operations, VMware Aria Automation Pipelines, Aria Operations for Logs) and VMware Cloud Director. The solution enables Virtual Infrastructure Administrators and Automation Developers to use standard DevOps practices for managing and deploying content.
 
@@ -39,10 +39,16 @@ Build Tools for VMware Aria provides development and release management tools fo
     ```
 
 ## Package dependencies
-- npm: 6.14.13
-- node: 14.17.1
-- maven: 3.8.7
-- jdk: 17
+- npm: 6.14.x (One compatible with your node version)
+- node: 14.x.x - 16.x.x (only 14 is supported for vcd-ng and vcd-ng-angular8)
+- maven: 3.9.x
+- jdk: 17, 21
+
+To check if the dependencies are met, you can run:
+
+```sh
+curl -o- https://raw.githubusercontent.com/vmware/build-tools-for-vmware-aria/main/health.sh | bash
+```
 
 ## Support
 

common/artifact-manager/pom.xml

@@ -87,12 +87,12 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>6.1.13</version>
+			<version>6.1.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.3.1</version>
+			<version>5.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents.core5</groupId>
@@ -107,13 +107,13 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.9</version>
+			<version>2.11.0</version>
 		</dependency>
 		<!-- includes snakeyaml: -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
-			<version>2.17.2</version>
+			<version>2.18.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -128,7 +128,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.13.0</version>
+			<version>3.17.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -143,7 +143,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.29</version>
+			<version>2.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>net.minidev</groupId>
@@ -163,13 +163,13 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.3.2</version>
+			<version>5.11.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
-			<version>5.3.2</version>
+			<version>5.11.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -180,7 +180,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/configuration/ConfigurationVraNg.java

@@ -33,10 +33,6 @@ public class ConfigurationVraNg extends Configuration {
 	 * param CSP_HOST.
 	 */
 	public static final String CSP_HOST = "csp.host";
-	/**
-	 * param PROJECT_ID.
-	 */
-	public static final String PROJECT_ID = "project.id";
 	/**
 	 * param DATA_COLLECTION_DELAY_SECONDS.
 	 */
@@ -50,10 +46,6 @@ public class ConfigurationVraNg extends Configuration {
 	 * param PROJECT_NAME.
 	 */
 	public static final String PROJECT_NAME = "project.name";
-	/**
-	 * param ORGANIZATION_ID.
-	 */
-	public static final String ORGANIZATION_ID = "org.id";
 	/**
 	 * param ORGANIZATION_NAME.
 	 */
@@ -131,13 +123,6 @@ public String getAuthHost() {
 		}
 	}
 
-	/**
-	 * @return String
-	 */
-	public String getProjectId() {
-		return this.properties.getProperty(PROJECT_ID);
-	}
-
 	/**
 	 * @return String
 	 */
@@ -152,13 +137,6 @@ public String getProjectName() {
 		return this.properties.getProperty(PROJECT_NAME);
 	}
 
-	/**
-	 * @return String
-	 */
-	public String getOrgId() {
-		return this.properties.getProperty(ORGANIZATION_ID);
-	}
-
 	/**
 	 * @return String
 	 */
@@ -251,12 +229,12 @@ public void validate(boolean domainOptional) throws ConfigurationException {
 			message.append("Port ");
 		}
 
-		if (StringUtils.isEmpty(getProjectId()) && StringUtils.isEmpty(getProjectName())) {
-			message.append("Project name/Project id ");
+		if (StringUtils.isEmpty(getProjectName())) {
+			message.append("Project name ");
 		}
 
-		if (StringUtils.isEmpty(getOrgId()) && StringUtils.isEmpty(getOrgName())) {
-			message.append("Organization id and Organization Name ");
+		if (StringUtils.isEmpty(getOrgName())) {
+			message.append("Organization Name ");
 		}
 
 		if (StringUtils.isEmpty(getRefreshToken()) && StringUtils.isEmpty(super.getUsername())) {
@@ -274,7 +252,9 @@ public void validate(boolean domainOptional) throws ConfigurationException {
 	public void deprecationWarnings() {
 		String[] deprecatedFlags = new String[] {
 				"bp.ignore.versions",
-				"bp.release"
+				"bp.release",
+				"project.id",
+				"org.id"
 		};
 
 		for (String flag : deprecatedFlags) {

common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/configuration/ConfigurationVroNg.java

@@ -30,17 +30,12 @@ public static ConfigurationVroNg fromProperties(Properties props) throws Configu
 	}
 
 	// Important - when modify properties refer to comments in @Configuration
-	public static final String ORGANIZATION_ID = "org.id";
 	public static final String REFRESH_TOKEN = "refresh.token";
 
 	/**
 	 * vRA Package Import content conflict resolution mode
 	 */
 
-	public String getOrgId() {
-		return this.properties.getProperty(ORGANIZATION_ID);
-	}
-
 	public String getRefreshToken() {
 		return this.properties.getProperty(REFRESH_TOKEN);
 	}