Skip to content

Commit 430f1cd

Browse files
committed
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.
1 parent 3cd750f commit 430f1cd

File tree

615 files changed

+29448
-8332
lines changed

Some content is hidden

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

615 files changed

+29448
-8332
lines changed

.github/workflows/Build.yml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -179,32 +179,16 @@ jobs:
179179
MAVEN_PASSWORD: ${{ secrets.MAVEN_OSSRH_TOKEN }}
180180
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_BUILDER_PASSPHRASE }}
181181

182-
dispatch-build:
183-
name: Dispatch build result
184-
needs: build
185-
if: github.repository_owner == 'GeneXusLabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
186-
187-
runs-on: ubuntu-latest
188-
182+
update-genexus-dependency:
189183
concurrency:
190184
group: build-${{ github.ref }}
191185
cancel-in-progress: true
192-
193-
steps:
194-
- name: Checkout action
195-
uses: actions/checkout@v2
196-
with:
197-
repository: genexuslabs/dispatch-build-result
198-
ref: releases/v2
199-
token: ${{ secrets.SECURE_TOKEN }}
200-
path: ./tmp/.github/actions/dispatch-build-result
201-
202-
- name: Dispatch build result
203-
uses: ./tmp/.github/actions/dispatch-build-result
204-
with:
205-
component-name: ${{ github.event.inputs.repository }}
206-
branch-ref: ${{ env.GIT_REF }}
207-
new-version: ${{ needs.build.outputs.MAVEN_VERSION }}
208-
committer: ${{ needs.build.outputs.LAST_COMMITTER }}
209-
commit-message: ${{ needs.build.outputs.COMMIT_MESSAGE }}
210-
token: ${{ secrets.SECURE_TOKEN }}
186+
uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/update-genexus-dep-version.yml@main
187+
needs: build
188+
if: github.repository_owner == 'genexuslabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
189+
with:
190+
VERSION: ${{ needs.build.outputs.MAVEN_VERSION }}
191+
PACKAGE_NAMES: ${{ needs.build.outputs.PACKAGES_NAME }}
192+
COMMIT_MESSAGE: ${{ needs.build.outputs.COMMIT_MESSAGE }}
193+
COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
194+
secrets: inherit
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

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#vscode
2+
.vscode/
3+
14
# Maven
25
log/
36
target/
@@ -6,6 +9,9 @@ target/
69
.idea/
710
*.iml
811

12+
#VSCode
13+
.vscode/
14+
915
# Mac OS
1016
.DS_Store
1117

README.md

Lines changed: 13 additions & 1 deletion

android/pom.xml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,15 @@
1414
<name>GeneXus Standard Classes for Android</name>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>${project.groupId}</groupId>
19-
<artifactId>gxcryptocommon</artifactId>
20-
<version>${project.version}</version>
21-
<exclusions>
22-
<exclusion> <!-- exclude common io from android -->
23-
<groupId>commons-io</groupId>
24-
<artifactId>commons-io</artifactId>
25-
</exclusion>
26-
<exclusion> <!-- exclude bouncycastle from android -->
27-
<groupId>org.bouncycastle</groupId>
28-
<artifactId>bcprov-jdk18on</artifactId>
29-
</exclusion>
30-
</exclusions>
31-
</dependency>
3217
<dependency>
3318
<groupId>${project.groupId}</groupId>
3419
<artifactId>gxcommon</artifactId>
3520
<version>${project.version}</version>
3621
<exclusions>
22+
<exclusion> <!-- declare the exclusion here -->
23+
<groupId>org.apache.httpcomponents</groupId>
24+
<artifactId>httpclient</artifactId>
25+
</exclusion>
3726
<exclusion> <!-- exclude common io from android -->
3827
<groupId>commons-io</groupId>
3928
<artifactId>commons-io</artifactId>
@@ -44,7 +33,7 @@
4433
</exclusion>
4534
</exclusions>
4635
</dependency>
47-
<dependency>
36+
<dependency>
4837
<groupId>org.locationtech.spatial4j</groupId>
4938
<artifactId>spatial4j</artifactId>
5039
<version>0.7</version>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)