Merge branch 'master' into EncryptPswDatasource

Author: iroqueta

.github/workflows/Build.yml

@@ -178,33 +178,17 @@ jobs:
         MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.MAVEN_OSSRH_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_BUILDER_PASSPHRASE }}
-
-  dispatch-build:
-    name: Dispatch build result
-    needs: build
-    if: github.repository_owner == 'GeneXusLabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
-    
-    runs-on: ubuntu-latest
-
+ 
+  update-genexus-dependency:
     concurrency: 
       group: build-${{ github.ref }}
       cancel-in-progress: true
-
-    steps:
-      - name: Checkout action
-        uses: actions/checkout@v2
-        with:
-            repository: genexuslabs/dispatch-build-result
-            ref: releases/v2
-            token: ${{ secrets.SECURE_TOKEN }}
-            path: ./tmp/.github/actions/dispatch-build-result
-
-      - name: Dispatch build result
-        uses: ./tmp/.github/actions/dispatch-build-result
-        with:
-          component-name: ${{ github.event.inputs.repository }}
-          branch-ref: ${{ env.GIT_REF }}
-          new-version: ${{ needs.build.outputs.MAVEN_VERSION }}
-          committer: ${{ needs.build.outputs.LAST_COMMITTER }}
-          commit-message: ${{ needs.build.outputs.COMMIT_MESSAGE }}
-          token: ${{ secrets.SECURE_TOKEN }}
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/update-genexus-dep-version.yml@main
+    needs: build
+    if: github.repository_owner == 'genexuslabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
+    with: 
+      VERSION: ${{ needs.build.outputs.MAVEN_VERSION }}
+      PACKAGE_NAMES: ${{ needs.build.outputs.PACKAGES_NAME }}
+      COMMIT_MESSAGE: ${{ needs.build.outputs.COMMIT_MESSAGE }}
+      COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
+    secrets: inherit

.github/workflows/call-beta-bot.yml

@@ -0,0 +1,18 @@
+name: Call Beta Bot
+
+on:
+  # Triggers the workflow on push to beta branch or changes in a pull request to main branch
+  push:
+    branches: [ "beta" ]
+  pull_request:
+    types: [ opened, synchronize, reopened, ready_for_review, closed, labeled, unlabeled ]
+    branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  call-workflow:
+    if: github.repository_owner == 'genexuslabs'
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/run-beta-bot.yml@main
+    secrets: inherit

android/src/main/java/com/genexus/util/GxJsonReader.java

@@ -5,7 +5,7 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.lang.CharEncoding;
+import java.nio.charset.StandardCharsets;
 
 import com.genexus.internet.StringCollection;
 import com.google.gson.stream.JsonReader;
@@ -14,11 +14,7 @@ public class GxJsonReader {
 	private JsonReader reader;
 
 	public GxJsonReader(InputStream stream) {
-		try {
-			reader = new JsonReader(new InputStreamReader(stream, CharEncoding.UTF_8));
-		} catch (UnsupportedEncodingException e) {
-			//TODO
-		}
+		reader = new JsonReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
 	}
 
 	public boolean readBeginArray() {

common/pom.xml

@@ -30,11 +30,11 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.15</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.17.0</version>
+        </dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>

common/src/main/java/com/genexus/BaseProvider.java

@@ -12,7 +12,7 @@
 import com.genexus.diagnostics.core.ILogger;
 import com.genexus.diagnostics.core.LogManager;
 import com.genexus.xml.XMLReader;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.genexus.GXSmartCacheProvider.DataUpdateStatus;
 import com.genexus.common.classes.AbstractGXFile;

common/src/main/java/com/genexus/CommonUtil.java

@@ -12,7 +12,7 @@
 import java.text.*;
 import java.util.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.*;
 import java.security.*;

common/src/main/java/com/genexus/util/ExpressionEvaluator.java

@@ -3,7 +3,7 @@
 
 import java.util.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.genexus.ModelContext;
 import com.genexus.common.interfaces.SpecificImplementation;

common/src/main/java/com/genexus/xml/XMLWriter.java

@@ -8,7 +8,7 @@
 import com.genexus.CommonUtil;
 import java.util.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 

gxawsserverless/src/main/java/com/genexus/cloud/serverless/GXProcedureExecutor.java

@@ -8,7 +8,7 @@
 import com.genexus.cloud.serverless.model.EventMessageResponse;
 import com.genexus.cloud.serverless.model.EventMessages;
 import com.genexus.db.DynamicExecute;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;

gxcache-redis/src/main/java/com/genexus/cache/redis/RedisClient.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.DeserializationFeature;