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.

.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

@@ -12,7 +12,6 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 | Name  | Description
 |---|---
 | common | Classes common to Android and Java
-| gxcryptocommon | Classes common to Android and Java related to Cryptography
 | gxmail | Classes related to mail handling
 | java | Java standard classes,  output is gxclassr.jar
 | wrappercommon | Interfaces to encapsulate Java EE and Jakarta EE support,  output is gxwrappercommon.jar
@@ -25,6 +24,15 @@ These are the source of the GeneXus Standard Classes for Java, valid since GeneX
 | gxexternalproviders | Implements service provider for IBM Cloud, Google, Azure, Amazon
 | gxgeospatial | Geography data type implementation
 | gxodata | OData access
+| securityapicommons | SecurityAPI's common module
+| gxcryptography | SecurityAPI's GeneXusCryptography module
+| gxjwt | SecurityAPI's GeneXusJWT module
+| gxxmlsignature | SecurityAPI's GeneXusXmlSignature module
+| gxftps | SecurityAPI's GeneXusFTPS module
+| gxsftp | SecurityAPI's GeneXusSFTP module
+| gamsaml | GAM's External Object, SAML protocol implementation
+| gamutils | GAM external object with utilities
+| gamtotp | GAM external object for RFC6238 implementation
 
 The dependencies between the projects are specified in each pom.xml within their directory.
 
@@ -87,3 +95,7 @@ Once you compiled or packaged everything you needed, you can stop the container
     See the License for the specific language governing permissions and
     limitations under the License.
 
+  ## Agreement on Compatibility from now on
+
+  With interfaces now in place since the v16 Upgrade 4 release, GeneXus SA commits to evolve them while maintaining compatibility.
+

android/pom.xml

@@ -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>

common/src/main/java/HTTPClient/CookieModule.java → android/src/main/java/HTTPClient/CookieModule.java

@@ -11,23 +11,6 @@
 import java.util.Hashtable;
 import java.util.Enumeration;
 
-import java.awt.Frame;
-import java.awt.Panel;
-import java.awt.Label;
-import java.awt.Color;
-import java.awt.Button;
-import java.awt.Graphics;
-import java.awt.Dimension;
-import java.awt.TextArea;
-import java.awt.TextField;
-import java.awt.GridLayout;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowAdapter;
-
 
 /**
  * This module handles Netscape cookies (also called Version 0 cookies)

common/src/main/java/HTTPClient/DefaultAuthHandler.java → android/src/main/java/HTTPClient/DefaultAuthHandler.java

@@ -9,21 +9,6 @@
 import java.util.Vector;
 import java.util.StringTokenizer;
 
-import java.awt.Frame;
-import java.awt.Panel;
-import java.awt.Label;
-import java.awt.Button;
-import java.awt.Dimension;
-import java.awt.TextField;
-import java.awt.GridLayout;
-import java.awt.BorderLayout;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowAdapter;
-
 /**
  * This class is the default authorization handler. It currently handles the
  * authentication schemes "Basic", "Digest", and "SOCKS5" (used for the

common/src/main/java/HTTPClient/HTTPConnection.java → android/src/main/java/HTTPClient/HTTPConnection.java

@@ -47,10 +47,7 @@
 import java.net.NoRouteToHostException;
 import java.util.Vector;
 
-import com.genexus.common.interfaces.SpecificImplementation;
-
 import java.util.StringTokenizer;
-import java.applet.Applet;
 
 
 /**
@@ -664,11 +661,11 @@ public static String descramble(String scrambled)
      *
      * @param applet the current applet
      */
-    public HTTPConnection(Object applet)  throws ProtocolNotSuppException
-    {
-    	if (SpecificImplementation.HTTPConnection != null)
-    		SpecificImplementation.HTTPConnection.createHttpConnectionFromApplet(applet, this);
-    }
+//    public HTTPConnection(Object applet)  throws ProtocolNotSuppException
+//    {
+//    	if (SpecificImplementation.HTTPConnection != null)
+//    		SpecificImplementation.HTTPConnection.createHttpConnectionFromApplet(applet, this);
+//    }
 
 
     /**

common/src/main/java/HTTPClient/JSSESSLConnection.java → android/src/main/java/HTTPClient/JSSESSLConnection.java

@@ -7,9 +7,7 @@
 import java.io.IOException;
 
 import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSocketFactory;
-import javax.security.cert.X509Certificate;
 
 /** Esta clase provee un Binding SSL para la libreria JSSE de Sun
  *

common/src/main/java/HTTPClient/MD4.java → android/src/main/java/HTTPClient/MD4.java

@@ -28,8 +28,6 @@
 
 package HTTPClient;
 
-import  java.io.FileInputStream;
-
 
 /**
  * This class implements the MD4 hash as specified in RFC-1320.

android/src/main/java/com/artech/base/synchronization/bc/PendingEventHelper.java

@@ -9,7 +9,7 @@
 import com.genexus.GxSilentTrnSdt;
 import com.genexus.IGxSilentTrn;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public class PendingEventHelper {
 

android/src/main/java/com/artech/synchronization/ISynchronizationHelper.java

@@ -2,7 +2,7 @@
 
 import java.util.TreeMap;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public interface ISynchronizationHelper {
 

android/src/main/java/com/genexus/GXutil.java

@@ -21,7 +21,7 @@
 import com.genexus.util.GXThreadLocal;
 import com.genexus.util.IThreadLocal;
 
-import json.org.json.JSONObject;
+import org.json.JSONObject;
 
 public final class GXutil
 {