Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebasing with master #5771

Closed
wants to merge 96 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
b976514
[BACKLOG-38038] - Allow plugin to initialize multiple lifecycle liste…
wseyler Oct 17, 2023
c792c85
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jan 4, 2024
2ddef36
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jan 16, 2024
b6c10bb
Merge branch 'master' of github.com:pentaho/pentaho-platform; branch …
wseyler Jan 22, 2024
483b0ab
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jan 24, 2024
505b513
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jan 25, 2024
b60e015
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jan 29, 2024
7353f56
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Feb 9, 2024
dd472ac
[BISERVER-15009] - Remove the version checker from the product
rmansoor Jul 1, 2024
53ec9bf
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Jul 1, 2024
52411ae
Merge branch 'BISERVER-15009' of github.com:rmansoor/pentaho-platform
wseyler Jul 1, 2024
1cab268
[PPP-4582] Use of Vulnerable Component: Components/oauth_client_libra…
singletonc Aug 2, 2024
caa64b7
[PPP-4784] Vulnerable Component: groovy
singletonc Aug 7, 2024
5fe7277
Merge remote-tracking branch 'upstream/master' into PPP-4784
singletonc Aug 7, 2024
5556142
Merge branch 'master' of github.com:pentaho/pentaho-platform
wseyler Aug 22, 2024
73fd368
[CLEAUP] update git ignore file list, add .DS_Store to .gitignore
NJtwentyone Aug 22, 2024
fa5ce4c
[CLEANUP] fixing failing test KarafBootTest#verifyStaleLockBehavior
NJtwentyone Aug 22, 2024
7bc5d24
Merge pull request #5680 from singletonc/PPP-4784
rmansoor Aug 22, 2024
0c23ca7
[PPP-4825] - Upgrade to drools 8.44.0.Final
wseyler Aug 23, 2024
469d2a1
Merge pull request #5696 from NJtwentyone/cleanup/KarafBootTest_verif…
krishnaalluhitachi Aug 26, 2024
8ea0998
[PPP-4174] Migrate axis2 web services to jax-rs and remove axis2
rmansoor May 23, 2024
e8866f8
Merge pull request #5697 from peterrinehart/PPP-4174
tkafalas Aug 26, 2024
20c0245
[PDI-20086] Fix file locking errors on windows.
peterrinehart Aug 27, 2024
38ec99f
[BACKLOG-36134]-Consolidate Redundant Secure XML Parsing code
Mandakini1990 Aug 28, 2024
cad54af
Merge pull request #5700 from peterrinehart/PDI-20086-windowsfix
ddiroma Aug 28, 2024
511929d
[PPP-4776] Modify scripts to not detete the Quartz database
tkafalas Aug 28, 2024
9ec3956
Merge pull request #5703 from tkafalas/feature
ddiroma Aug 29, 2024
b533808
[PRD-6138] Add reporting info logging in log4j2.xml
befc Aug 30, 2024
03376fa
Merge pull request #5706 from befc/PRD-6138
smmribeiro Aug 30, 2024
8e738b9
HNC-766: updated license
lgrill-pentaho Sep 3, 2024
f0051cc
HNC-766: updated license
lgrill-pentaho Sep 3, 2024
35ab293
Merge pull request #5701 from Mandakini111/master
krishnaalluhitachi Sep 7, 2024
b3c731a
[REVERT]-BACKLOG-36134-Consolidate Redundant Secure XML Parsing code
Mandakini1990 Sep 9, 2024
1a1613b
Merge pull request #5709 from Mandakini111/master
krishnaalluhitachi Sep 9, 2024
e00dc1d
[PPP-4895] Update jettison version to 1.5.4
niehusa Aug 26, 2024
6a32e6d
Merge pull request #5712 from wseyler/PPP-4825
angel-ramoscardona Sep 11, 2024
c0362ea
Merge pull request #5702 from niehusa/master
krishnaalluhitachi Sep 11, 2024
79a6aad
[PPP-4825] - Upgrade to drools 8.44.0.Final
wseyler Sep 12, 2024
d63790f
Merge pull request #5714 from wseyler/PPP-4825
rmansoor Sep 12, 2024
14978a8
[PPP-5166] - Use of Vulnerable Component: Components/jackson-databind…
soagarwal1 Aug 29, 2024
3fac5a9
Merge pull request #5676 from singletonc/PPP-4582
rmansoor Sep 17, 2024
6229d5f
Merge pull request #5717 from soagarwal1/PPP-5166
NJtwentyone Sep 18, 2024
7f30141
[TEST] Configure dependabot for daily scans
lucboudreau Sep 19, 2024
a43d6c0
[TEST] Fix dependabot
lucboudreau Sep 19, 2024
17948cb
[TEST] Configure Dependabot for one repo
lucboudreau Sep 19, 2024
37230e9
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
bb470ff
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
8686a67
[TEST] Confire dependabot
lucboudreau Sep 19, 2024
183758f
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
a41f6ec
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
6ff9d92
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
e0eb0bd
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
156fb63
[TEST] Configure dependabot
lucboudreau Sep 19, 2024
7ab63fd
[PPP-5163] Vulnerable Component: snakeyaml - part 2 ( Non OSGi upgrade)
NJtwentyone Sep 20, 2024
bd99d18
Merge pull request #5723 from NJtwentyone/issues/PPP-5163/snakeyaml_v2
rmansoor Sep 20, 2024
87ea949
[PPP-4776] Finalize Quartz Migrations Scripts
tkafalas Sep 23, 2024
1a4d69e
Merge pull request #5725 from tkafalas/feature
ddiroma Sep 24, 2024
f5784ae
[PPP-4825] - Upgrade to drools 8.44.0.Final
wseyler Sep 24, 2024
98288a2
HNC-766: updated license and copyright headers
lgrill-pentaho Sep 24, 2024
8c02388
Merge pull request #5727 from wseyler/master
rmansoor Sep 24, 2024
e09dd38
[PDI-20206] Add base64/url decoding for passwords in ldap authenticator
befc Sep 24, 2024
9503fc1
[PDI-20206] Address failing unit tests and PR comments
befc Sep 25, 2024
e0ceb88
Revert "[PDI-20206] Address failing unit tests and PR comments"
befc Sep 27, 2024
1012110
Revert "[PDI-20206] Add base64/url decoding for passwords in ldap aut…
befc Sep 27, 2024
84c97ed
[PDI-20206] Revert "[BISERVER-14644] - Users with password having cer…
smmribeiro Oct 3, 2024
104d87e
[PDI-20206] Revert "[BISERVER-14644] - Users with password having cer…
smmribeiro Oct 3, 2024
6219e63
[PDI-20206] Revert "[BISERVER-14644] - Users with password having cer…
smmribeiro Oct 3, 2024
7c19700
Merge pull request #5738 from smmribeiro/PDI-20206
smmribeiro Oct 4, 2024
adbc4ad
[BISERVER-15051] hide internal variables PUC side
srallapa Oct 11, 2024
1d1b0aa
[BISERVER-14374] Add the ability for users to select a time zone for a
peterrinehart Sep 5, 2024
ebef9cf
Merge pull request #5745 from srallapa/BISERVER-15051-disable-interna…
ddiroma Oct 15, 2024
7664597
Merge pull request #5730 from peterrinehart/BISERVER-14374
ddiroma Oct 15, 2024
3dc38ba
Revert "[BISERVER-14374] Add the ability for users to select a time z…
ddiroma Oct 16, 2024
af5c674
Merge pull request #5746 from pentaho/revert-5730-BISERVER-14374
ddiroma Oct 16, 2024
2b4f6a7
Revert "Revert "[BISERVER-14374] Add the ability for users to select …
ddiroma Oct 16, 2024
350eb33
Merge pull request #5747 from pentaho/revert-5746-revert-5730-BISERVE…
ddiroma Oct 16, 2024
908a697
Revert "[BISERVER-15051] hide internal variables PUC side"
ddiroma Oct 16, 2024
a386ba3
Merge pull request #5748 from pentaho/revert-5745-BISERVER-15051-disa…
ddiroma Oct 16, 2024
642c095
Revert "Revert "[BISERVER-15051] hide internal variables PUC side""
ddiroma Oct 17, 2024
56b0c29
Merge pull request #5749 from pentaho/revert-5748-revert-5745-BISERVE…
ddiroma Oct 17, 2024
358c392
[DEVO-11106] - Fix the CodeQL GHA build for pentaho-platform
cardosov Oct 25, 2024
e3999e5
Merge pull request #5751 from pentaho/DEVO-11106
cardosov Oct 28, 2024
117a4c4
[DEVO-11106] - Adding container image and CodeQL caching
cardosov Oct 28, 2024
515ab59
Merge pull request #5753 from pentaho/DEVO-11106
cardosov Oct 28, 2024
f8a95db
[DEVO-11106] - Fixing cache hosted tools cache location
cardosov Oct 28, 2024
341dcd1
Merge pull request #5754 from pentaho/DEVO-11106
cardosov Oct 28, 2024
4f50732
[CLEANUP] - Updating caching
cardosov Oct 29, 2024
c624ec1
Merge pull request #5756 from pentaho/cardosov-patch-1
cardosov Oct 29, 2024
35b987f
[PPP-4776] Do not drop quartz user if it exists, but create it if it
peterrinehart Oct 30, 2024
a882285
feat: add children with same depth to expanded path [BACKLOG-41878] (…
loonatic Oct 30, 2024
b573795
Merge pull request #5759 from peterrinehart/PPP-4776
ddiroma Oct 30, 2024
74d719a
[PPP-4776] - Adding a end and start markers to split the script into …
rmansoor Oct 30, 2024
41dbf5f
Merge pull request #5761 from rmansoor/PPP-4776
rmansoor Oct 30, 2024
dbe7866
[PPP-4776] update to mysql create quartz script to handle if user alr…
ddiroma Oct 31, 2024
17518e4
[PPP-4776] Ensure tablespace does not exist before trying to create it.
peterrinehart Nov 4, 2024
b672a1f
Merge pull request #5767 from peterrinehart/PPP-4776-fix2
ddiroma Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: 2
registries:
one-artifactory:
type: maven-repository
url: https://one.hitachivantara.com/artifactory/pnt-mvn
username: ${{secrets.DEPENDABOT_ONE_USER}}
password: ${{secrets.DEPENDABOT_ONE_KEY}}
replaces-base: true
updates:
- package-ecosystem: "maven"
directory: "/"
registries:
- one-artifactory
schedule:
interval: daily
ignore:
- dependency-name: org.apache.maven:*
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
29 changes: 18 additions & 11 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,25 @@ name: "CodeQL"
on:
push:
branches: [ master ]
paths-ignore:
- '.github/**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
paths-ignore:
- '.github/**'
schedule:
- cron: '23 19 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: k8s

container:
image: repo-cache.orl.eng.hitachivantara.com/docker/jenkins-build/maven/open-jdk/17
volumes:
- /home/runner/caches/pentaho/.m2:/maven-local-cache

strategy:
fail-fast: false
Expand All @@ -35,17 +44,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Setup Java JDK
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
uses: actions/checkout@v4

- name: Set Maven cache location
run: |
echo "MAVEN_ARGS=-Dmaven.repo.local='/maven-local-cache'" >> $GITHUB_ENV

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +63,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -70,4 +77,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bin/
.settings
.metadata/
.recommenders/
.DS_Store

out/
build-utils/dist/
Expand Down
65 changes: 64 additions & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1 +1,64 @@
Note: This is a this is a multi-module project, and each module holds its own LICENSE.txt.
Pentaho Developer Edition 10.3 Copyright 2024 Hitachi Vantara, LLC; licensed under the Business Source License 1.1 (BSL).
This project may include third party components that are individually licensed per the terms indicated by their respective copyright owners
included in text file or in the source code.


License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.


Parameters

Licensor: Hitachi Vantara, LLC.
Licensed Work: Pentaho Developer Edition 10.3. The Licensed Work is (c) 2024
Hitachi Vantara, LLC.
Additional Use Grant: None
Change Date: Four years from the date the Licensed Work is published.
Change License: Apache 2.0

For information about alternative licensing arrangements for the Licensed Work,
please contact [email protected].

Notice

Business Source License 1.1

Terms

The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited production use.

Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.

If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.

All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.

You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.

Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.

This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).

TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
Loading