Restore branch 'genexuslabs:wss4j' and 'genexuslabs:beta' into "beta"

- Previous revert were wrongly done by the auto-prs-merger as part of the process of 'beta' recovery.

This reverts commit 4596f4e and 3cd750f.

Author: anaiberta

.github/workflows/Build.yml

@@ -179,32 +179,16 @@ jobs:
         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

.gitignore

@@ -1,3 +1,6 @@
+#vscode
+.vscode/
+
 # Maven
 log/
 target/
@@ -6,6 +9,9 @@ target/
 .idea/
 *.iml
 
+#VSCode
+.vscode/
+
 # Mac OS
 .DS_Store
 

README.md

@@ -14,26 +14,15 @@
 	<name>GeneXus Standard Classes for Android</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>gxcryptocommon</artifactId>
-			<version>${project.version}</version>
-            <exclusions>
-                <exclusion>  <!-- exclude common io from android -->
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-                <exclusion>  <!-- exclude bouncycastle from android -->
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk18on</artifactId>
-                </exclusion>
-            </exclusions>
-		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>gxcommon</artifactId>
 			<version>${project.version}</version>
             <exclusions>
+                <exclusion>  <!-- declare the exclusion here -->
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
                 <exclusion>  <!-- exclude common io from android -->
                     <groupId>commons-io</groupId>
                     <artifactId>commons-io</artifactId>
@@ -44,7 +33,7 @@
                 </exclusion>
             </exclusions>
 		</dependency>
-		<dependency>
+        <dependency>
 			<groupId>org.locationtech.spatial4j</groupId>
 			<artifactId>spatial4j</artifactId>
 			<version>0.7</version>