Skip to content

Commit 7f522fb

Browse files
AlejandroPAlejandroP
authored
Merge branch 'master' into fix_status_remoteapi
2 parents 06cfb8f + 7cabd4b commit 7f522fb

File tree

220 files changed

+4792
-6988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+4792
-6988
lines changed

‎.github/workflows/Build.yml

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,17 @@ jobs:
3636
fetch-depth: 0
3737

3838
- name: Setup Java JDK
39-
uses: actions/setup-java@v1.4.3
39+
uses: actions/setup-java@v4
4040
with:
41-
java-version: 17
41+
java-version: ${{ vars.JAVA_VERSION }}
42+
distribution: 'temurin'
4243
gpg-private-key: ${{ secrets.MAVEN_GPG_BUILDER_PRIVATE_KEY }}
4344
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4445

4546
- name: Setup Maven
4647
uses: stCarolas/setup-maven@v4.5
4748
with:
48-
maven-version: 3.8.7
49+
maven-version: ${{ vars.MAVEN_VERSION }}
4950

5051
- name: Setup Maven settings
5152
uses: whelk-io/maven-settings-xml-action@v14
@@ -79,16 +80,14 @@ jobs:
7980
master)
8081
echo "## Is MASTER branch"
8182
82-
versionChangelist="-stable.$timestamp-SNAPSHOT"
83+
versionChangelist="-preview.$timestamp-SNAPSHOT"
8384
SHOULD_DEPLOY='true'
8485
;;
8586
8687
beta)
87-
echo "## Is BETA branch, add +100 to major number"
88+
echo "## Is BETA branch"
8889
89-
pomMajorNumber=$(expr $pomMajorNumber + 100)
90-
91-
versionChangelist="-trunk.$timestamp-SNAPSHOT"
90+
versionChangelist="-beta.$timestamp-SNAPSHOT"
9291
SHOULD_DEPLOY='true'
9392
;;
9493
@@ -177,33 +176,16 @@ jobs:
177176
MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }}
178177
MAVEN_PASSWORD: ${{ secrets.MAVEN_OSSRH_TOKEN }}
179178
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_BUILDER_PASSPHRASE }}
180-
181-
dispatch-build:
182-
name: Dispatch build result
183-
needs: build
184-
if: github.repository_owner == 'GeneXusLabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
185-
186-
runs-on: ubuntu-latest
187-
179+
180+
update-genexus-dependency:
188181
concurrency:
189182
group: build-${{ github.ref }}
190183
cancel-in-progress: true
191-
192-
steps:
193-
- name: Checkout action
194-
uses: actions/checkout@v2
195-
with:
196-
repository: genexuslabs/dispatch-build-result
197-
ref: releases/v2
198-
token: ${{ secrets.SECURE_TOKEN }}
199-
path: ./tmp/.github/actions/dispatch-build-result
200-
201-
- name: Dispatch build result
202-
uses: ./tmp/.github/actions/dispatch-build-result
203-
with:
204-
component-name: ${{ github.event.inputs.repository }}
205-
branch-ref: ${{ env.GIT_REF }}
206-
new-version: ${{ needs.build.outputs.MAVEN_VERSION }}
207-
committer: ${{ needs.build.outputs.LAST_COMMITTER }}
208-
commit-message: ${{ needs.build.outputs.COMMIT_MESSAGE }}
209-
token: ${{ secrets.SECURE_TOKEN }}
184+
uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/update-genexus-dep-version.yml@main
185+
needs: build
186+
if: github.repository_owner == 'genexuslabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
187+
with:
188+
VERSION: ${{ needs.build.outputs.MAVEN_VERSION }}
189+
PACKAGE_NAMES: ${{ needs.build.outputs.PACKAGES_NAME }}
190+
COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
191+
secrets: inherit

‎.github/workflows/cache-redis-tests.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,15 @@ jobs:
3232
fetch-depth: 1
3333

3434
- name: Setup Java JDK
35-
uses: actions/setup-java@v1.4.3
35+
uses: actions/setup-java@v4
3636
with:
37-
java-version: 17
37+
java-version: ${{ vars.JAVA_VERSION }}
38+
distribution: 'temurin'
39+
40+
- name: Setup Maven
41+
uses: stCarolas/setup-maven@v4.5
42+
with:
43+
maven-version: ${{ vars.MAVEN_VERSION }}
3844

3945
- name: Setup Maven settings
4046
uses: whelk-io/maven-settings-xml-action@v14
@@ -43,15 +49,15 @@ jobs:
4349
servers: '[{ "id": "github-genexuslabs", "username": "genexusbot", "password": "${{ secrets.SECURE_TOKEN }}" }]'
4450

4551
- name: Install
46-
run: mvn -B install --file $POM_PATH
52+
run: mvn -B install --file $POM_PATH -DskipTests
4753

4854
- name: Start Redis
4955
uses: supercharge/redis-github-action@1.4.0
5056
with:
5157
redis-version: ${{ matrix.redis-version }}
5258

53-
- name: Test Redis
54-
run: |
55-
export EXECUTE_REDIS_TESTS=true
56-
mvn -B -pl gxcache-redis test --file $POM_PATH
59+
- name: Test
60+
env:
61+
EXECUTE_REDIS_TESTS: true
62+
run: mvn -B -pl gxcache-redis test --file $POM_PATH
5763

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Call Beta Bot
2+
3+
on:
4+
# Triggers the workflow on push to beta branch or changes in a pull request to main branch
5+
push:
6+
branches: [ "beta" ]
7+
pull_request:
8+
types: [ opened, synchronize, reopened, ready_for_review, closed, labeled, unlabeled ]
9+
branches: [ "master" ]
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
jobs:
15+
call-workflow:
16+
if: github.repository_owner == 'genexuslabs'
17+
uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/run-beta-bot.yml@main
18+
secrets: inherit

‎.github/workflows/cloud-storage-tests.yml

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,15 @@ jobs:
3232
fetch-depth: 1
3333

3434
- name: Setup Java JDK
35-
uses: actions/setup-java@v1.4.3
35+
uses: actions/setup-java@v4
3636
with:
37-
java-version: 17
37+
java-version: ${{ vars.JAVA_VERSION }}
38+
distribution: 'temurin'
39+
40+
- name: Setup Maven
41+
uses: stCarolas/setup-maven@v4.5
42+
with:
43+
maven-version: ${{ vars.MAVEN_VERSION }}
3844

3945
- name: Setup Maven settings
4046
uses: whelk-io/maven-settings-xml-action@v14
@@ -43,33 +49,34 @@ jobs:
4349
servers: '[{ "id": "github-genexuslabs", "username": "genexusbot", "password": "${{ secrets.SECURE_TOKEN }}" }]'
4450

4551
- name: Install
46-
run: mvn -B install --file $POM_PATH
52+
run: mvn -B install --file $POM_PATH -DskipTests
4753

4854
- name: Test Cloud Storage
55+
env:
56+
AWSS3_TEST_ENABLED: true
57+
STORAGE_AWSS3_ACCESS_KEY: "${{ secrets.AWSS3_ACCESS_KEY }}"
58+
STORAGE_AWSS3_SECRET_KEY: "${{ secrets.AWSS3_SECRET_KEY }}"
59+
STORAGE_AWSS3_BUCKET_NAME: genexus-s3-test
60+
STORAGE_AWSS3_FOLDER_NAME: gxclasses
61+
STORAGE_AWSS3_REGION: us-east-1
62+
IBMCOS_TEST_ENABLED: true
63+
STORAGE_IBMCOS_ACCESS_KEY: "${{ secrets.IBMCOS_ACCESS_KEY }}"
64+
STORAGE_IBMCOS_SECRET_KEY: "${{ secrets.IBMCOS_SECRET_KEY }}"
65+
STORAGE_IBMCOS_BUCKET_NAME: gxclasses-unit-tests
66+
STORAGE_IBMCOS_FOLDER_NAME: tests
67+
STORAGE_IBMCOS_REGION: us-south
68+
AZUREBS_TEST_ENABLED: true
69+
STORAGE_AZUREBS_ACCESS_KEY: "${{ secrets.AZUREBS_ACCESS_KEY }}"
70+
STORAGE_AZUREBS_ACCOUNT_NAME: "${{ secrets.AZUREBS_ACCOUNT_NAME }}"
71+
STORAGE_AZUREBS_FOLDER_NAME: tests
72+
STORAGE_AZUREBS_PUBLIC_CONTAINER_NAME: contluispublic
73+
STORAGE_AZUREBS_PRIVATE_CONTAINER_NAME: contluisprivate
74+
GOOGLECS_TEST_ENABLED: true
75+
STORAGE_GOOGLECS_PROJECT_ID: gxjavacloudstorageunittests
76+
STORAGE_GOOGLECS_BUCKET_NAME: javaclasses-unittests
77+
STORAGE_GOOGLECS_FOLDER_NAME: gxclasses
78+
STORAGE_GOOGLECS_APPLICATION_NAME: gxjavacloudstorageunittests
4979
run: |
50-
export AWSS3_TEST_ENABLED=true
51-
export STORAGE_AWSS3_ACCESS_KEY="${{ secrets.AWSS3_ACCESS_KEY }}"
52-
export STORAGE_AWSS3_SECRET_KEY="${{ secrets.AWSS3_SECRET_KEY }}"
53-
export STORAGE_AWSS3_BUCKET_NAME=genexus-s3-test
54-
export STORAGE_AWSS3_FOLDER_NAME=gxclasses
55-
export STORAGE_AWSS3_REGION=us-east-1
56-
export IBMCOS_TEST_ENABLED=true
57-
export STORAGE_IBMCOS_ACCESS_KEY="${{ secrets.IBMCOS_ACCESS_KEY }}"
58-
export STORAGE_IBMCOS_SECRET_KEY="${{ secrets.IBMCOS_SECRET_KEY }}"
59-
export STORAGE_IBMCOS_BUCKET_NAME=gxclasses-unit-tests
60-
export STORAGE_IBMCOS_FOLDER_NAME=tests
61-
export STORAGE_IBMCOS_REGION=us-south
62-
export AZUREBS_TEST_ENABLED=true
63-
export STORAGE_AZUREBS_ACCESS_KEY="${{ secrets.AZUREBS_ACCESS_KEY }}"
64-
export STORAGE_AZUREBS_ACCOUNT_NAME="${{ secrets.AZUREBS_ACCOUNT_NAME }}"
65-
export STORAGE_AZUREBS_FOLDER_NAME=tests
66-
export STORAGE_AZUREBS_PUBLIC_CONTAINER_NAME=contluispublic
67-
export STORAGE_AZUREBS_PRIVATE_CONTAINER_NAME=contluisprivate
68-
export GOOGLECS_TEST_ENABLED=true
6980
export STORAGE_GOOGLECS_KEY="${{ secrets.GOOGLECS_KEY }}"
70-
export STORAGE_GOOGLECS_PROJECT_ID=gxjavacloudstorageunittests
71-
export STORAGE_GOOGLECS_BUCKET_NAME=javaclasses-unittests
72-
export STORAGE_GOOGLECS_FOLDER_NAME=gxclasses
73-
export STORAGE_GOOGLECS_APPLICATION_NAME=gxjavacloudstorageunittests
74-
81+
7582
mvn -B -pl gxcloudstorage-tests test --file $POM_PATH

‎.github/workflows/code-scanning.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
- uses: actions/checkout@v3
2828

2929
- name: Setup Java
30-
uses: actions/setup-java@v3
30+
uses: actions/setup-java@v4
3131
with:
32-
java-version: 17
32+
java-version: ${{ vars.JAVA_VERSION }}
3333
distribution: 'temurin'
3434

3535
- name: Setup Maven
3636
uses: stCarolas/setup-maven@v4.5
3737
with:
38-
maven-version: 3.8.7
38+
maven-version: ${{ vars.MAVEN_VERSION }}
3939

4040
- name: Setup Maven settings
4141
uses: whelk-io/maven-settings-xml-action@v14

‎.github/workflows/codeql-analysis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,18 @@ jobs:
4949
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5050

5151
- name: Setup Java JDK
52-
uses: actions/setup-java@v1.4.3
52+
uses: actions/setup-java@v4
5353
with:
54-
java-version: 17
54+
java-version: ${{ vars.JAVA_VERSION }}
55+
distribution: 'temurin'
5556
gpg-private-key: ${{ secrets.MAVEN_GPG_BUILDER_PRIVATE_KEY }}
5657
gpg-passphrase: MAVEN_GPG_PASSPHRASE
5758

59+
- name: Setup Maven
60+
uses: stCarolas/setup-maven@v4.5
61+
with:
62+
maven-version: ${{ vars.MAVEN_VERSION }}
63+
5864
- name: Setup Maven settings
5965
uses: whelk-io/maven-settings-xml-action@v14
6066
with:

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
| Branch | Status
2-
|---|---
3-
|master |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Amaster)
4-
|beta |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Abeta)
5-
61
# GeneXus Standard Classes for Java
7-
82
These are the source of the GeneXus Standard Classes for Java, valid since GeneXus 16 Upgrade 4.
93

4+
## Repo Status
5+
| Branch | Build | Security
6+
|---|---|---
7+
|master |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Amaster)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
8+
|beta |[![](https://github.com/genexuslabs/JavaClasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions?query=workflow%3ABuild+branch%3Abeta)|[![CodeQL](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/JavaClasses/actions/workflows/codeql-analysis.yml)
9+
1010
## Modules
1111

1212
| Name | Description

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.genexus.GxSilentTrnSdt;
1010
import com.genexus.IGxSilentTrn;
1111

12-
import json.org.json.JSONArray;
12+
import org.json.JSONArray;
1313

1414
public class PendingEventHelper {
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.TreeMap;
44

5-
import json.org.json.JSONArray;
5+
import org.json.JSONArray;
66

77
public interface ISynchronizationHelper {
88

‎android/src/main/java/com/genexus/Application.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ public static boolean hasClientPreferences()
250250
*/
251251
public static ClientPreferences getClientPreferences()
252252
{
253+
if (!hasClientPreferences())
254+
return null;
255+
253256
return (ClientPreferences) ((ModelContext)ClientContext.getModelContext()).getPreferences();
254257
}
255258

0 commit comments

Comments
 (0)