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

sync main branch to develop branch (#692) #694

Merged
merged 39 commits into from
Dec 20, 2023
Merged

sync main branch to develop branch (#692) #694

merged 39 commits into from
Dec 20, 2023

Conversation

sayaliM0412
Copy link
Contributor

  • Bump whelk-io/maven-settings-xml-action from 20 to 21

Bumps whelk-io/maven-settings-xml-action from 20 to 21.


updated-dependencies:

  • dependency-name: whelk-io/maven-settings-xml-action dependency-type: direct:production update-type: version-update:semver-major ...
  • Bump liquibase-github-actions/drop-all from 4.24.0 to 4.25.0

Bumps liquibase-github-actions/drop-all from 4.24.0 to 4.25.0.


updated-dependencies:

  • dependency-name: liquibase-github-actions/drop-all dependency-type: direct:production update-type: version-update:semver-minor ...
  • Bump actions/github-script from 7.0.0 to 7.0.1

Bumps actions/github-script from 7.0.0 to 7.0.1.


updated-dependencies:

  • dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0

Bumps com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0.


updated-dependencies:

  • dependency-name: com.ibm.db2:jcc dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2

Bumps org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2.


updated-dependencies:

  • dependency-name: org.codehaus.mojo:versions-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump org.postgresql:postgresql from 42.6.0 to 42.7.0

Bumps org.postgresql:postgresql from 42.6.0 to 42.7.0.


updated-dependencies:

  • dependency-name: org.postgresql:postgresql dependency-type: direct:development update-type: version-update:semver-minor ...
  • Bump org.firebirdsql.jdbc:jaybird from 5.0.2.java11 to 5.0.3.java11

Bumps org.firebirdsql.jdbc:jaybird from 5.0.2.java11 to 5.0.3.java11.


updated-dependencies:

  • dependency-name: org.firebirdsql.jdbc:jaybird dependency-type: direct:production update-type: version-update:semver-patch ...

Bumps org.xerial:sqlite-jdbc from 3.44.0.0 to 3.44.1.0.


updated-dependencies:

  • dependency-name: org.xerial:sqlite-jdbc dependency-type: direct:development update-type: version-update:semver-patch ...
  • Bump commons-io:commons-io from 2.15.0 to 2.15.1

Bumps commons-io:commons-io from 2.15.0 to 2.15.1.


updated-dependencies:

  • dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump org.mariadb.jdbc:mariadb-java-client from 3.3.0 to 3.3.1

Bumps org.mariadb.jdbc:mariadb-java-client from 3.3.0 to 3.3.1.


updated-dependencies:

  • dependency-name: org.mariadb.jdbc:mariadb-java-client dependency-type: direct:development update-type: version-update:semver-patch ...
  • Bump actions/setup-java from 3 to 4

Bumps actions/setup-java from 3 to 4.


updated-dependencies:

  • dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ...
  • Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3

Bumps org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3.


updated-dependencies:

  • dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump org.postgresql:postgresql from 42.7.0 to 42.7.1

Bumps org.postgresql:postgresql from 42.7.0 to 42.7.1.


updated-dependencies:

  • dependency-name: org.postgresql:postgresql dependency-type: direct:development update-type: version-update:semver-patch ...
  • Bump org.liquibase.ext:liquibase-sdk-maven-plugin

Bumps org.liquibase.ext:liquibase-sdk-maven-plugin from 0.10.22 to 0.10.23.


updated-dependencies:

  • dependency-name: org.liquibase.ext:liquibase-sdk-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ...
  • Bump net.snowflake:snowflake-jdbc from 3.14.3 to 3.14.4

Bumps net.snowflake:snowflake-jdbc from 3.14.3 to 3.14.4.


updated-dependencies:

  • dependency-name: net.snowflake:snowflake-jdbc dependency-type: direct:development update-type: version-update:semver-patch ...
  • DAT-16380 (DAT-16380 #673)

  • using -Dliquibase.sdk.workflowId=run-tests.yml

  • use sdk-maven-plugin 0.10.23

  • get liquibase --version

  • get branch develop

  • Trigger build



MalloD12 and others added 22 commits October 26, 2023 16:23
…nd performance

chore(main.yml): update Java version to 17 for better compatibility and performance
* Bump whelk-io/maven-settings-xml-action from 20 to 21

Bumps [whelk-io/maven-settings-xml-action](https://github.com/whelk-io/maven-settings-xml-action) from 20 to 21.
- [Release notes](https://github.com/whelk-io/maven-settings-xml-action/releases)
- [Commits](whelk-io/maven-settings-xml-action@v20...v21)

---
updated-dependencies:
- dependency-name: whelk-io/maven-settings-xml-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump liquibase-github-actions/drop-all from 4.24.0 to 4.25.0

Bumps [liquibase-github-actions/drop-all](https://github.com/liquibase-github-actions/drop-all) from 4.24.0 to 4.25.0.
- [Release notes](https://github.com/liquibase-github-actions/drop-all/releases)
- [Commits](liquibase-github-actions/drop-all@v4.24.0...v4.25.0)

---
updated-dependencies:
- dependency-name: liquibase-github-actions/drop-all
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/github-script from 7.0.0 to 7.0.1

Bumps [actions/github-script](https://github.com/actions/github-script) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@v7.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0

Bumps com.ibm.db2:jcc from 11.5.8.0 to 11.5.9.0.

---
updated-dependencies:
- dependency-name: com.ibm.db2:jcc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.codehaus.mojo:versions-maven-plugin from 2.16.1 to 2.16.2

Bumps [org.codehaus.mojo:versions-maven-plugin](https://github.com/mojohaus/versions) from 2.16.1 to 2.16.2.
- [Release notes](https://github.com/mojohaus/versions/releases)
- [Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md)
- [Commits](mojohaus/versions@2.16.1...2.16.2)

---
updated-dependencies:
- dependency-name: org.codehaus.mojo:versions-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.postgresql:postgresql from 42.6.0 to 42.7.0

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.0.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.6.0...REL42.7.0)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.firebirdsql.jdbc:jaybird from 5.0.2.java11 to 5.0.3.java11

Bumps [org.firebirdsql.jdbc:jaybird](https://github.com/FirebirdSQL/jaybird) from 5.0.2.java11 to 5.0.3.java11.
- [Release notes](https://github.com/FirebirdSQL/jaybird/releases)
- [Commits](https://github.com/FirebirdSQL/jaybird/commits)

---
updated-dependencies:
- dependency-name: org.firebirdsql.jdbc:jaybird
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* using Codex-/return-dispatch to get the run-id for OSS when a run is triggered (#666)

* fix error unexpected end of the stream within a double quoted scalar (#667)

* Bump org.xerial:sqlite-jdbc from 3.44.0.0 to 3.44.1.0

Bumps [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.44.0.0 to 3.44.1.0.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](xerial/sqlite-jdbc@3.44.0.0...3.44.1.0)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump commons-io:commons-io from 2.15.0 to 2.15.1

Bumps commons-io:commons-io from 2.15.0 to 2.15.1.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.mariadb.jdbc:mariadb-java-client from 3.3.0 to 3.3.1

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](mariadb-corporation/mariadb-connector-j@3.3.0...3.3.1)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/setup-java from 3 to 4

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.postgresql:postgresql from 42.7.0 to 42.7.1

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.7.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.liquibase.ext:liquibase-sdk-maven-plugin

Bumps [org.liquibase.ext:liquibase-sdk-maven-plugin](https://github.com/liquibase/liquibase-sdk-maven-plugin) from 0.10.22 to 0.10.23.
- [Release notes](https://github.com/liquibase/liquibase-sdk-maven-plugin/releases)
- [Commits](liquibase/liquibase-sdk-maven-plugin@v0.10.22...v0.10.23)

---
updated-dependencies:
- dependency-name: org.liquibase.ext:liquibase-sdk-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump net.snowflake:snowflake-jdbc from 3.14.3 to 3.14.4

Bumps [net.snowflake:snowflake-jdbc](https://github.com/snowflakedb/snowflake-jdbc) from 3.14.3 to 3.14.4.
- [Release notes](https://github.com/snowflakedb/snowflake-jdbc/releases)
- [Changelog](https://github.com/snowflakedb/snowflake-jdbc/blob/master/CHANGELOG.rst)
- [Commits](snowflakedb/snowflake-jdbc@v3.14.3...v3.14.4)

---
updated-dependencies:
- dependency-name: net.snowflake:snowflake-jdbc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* DAT-16380 (#673)

* using -Dliquibase.sdk.workflowId=run-tests.yml

* use sdk-maven-plugin 0.10.23

* get liquibase --version

* get branch develop

* Trigger build

---------

Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: KushnirykOleh <kushnirykOleh@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vitalii Makarchenkov <mail@vitaliimak.com>
Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
The command syntax for installing liquibase snapshot was incorrect. The command has been updated to use the correct syntax for installing the snapshot.
…ts to mvn liquibase-sdk:install-snapshot-cli
…tiple repositories and custom Liquibase home directory

feat(pom.xml): enable automatic installation of Liquibase if not found in the specified Liquibase home directory
…ild process

The Liquibase SDK snapshot is now being installed during the build process. This allows for the usage of the Liquibase SDK in subsequent steps. The installation is done using the Liquibase branch specified in the `configure-build` step, along with the repositories `liquibase/liquibase` and `liquibase/liquibase-pro`. Additionally, the workflow IDs `build.yml` and `run-tests.yml` are provided for the Pro and non-Pro workflows respectively. The installed snapshot version is then displayed in the build overview.
…emove unnecessary arguments

feat(main.yml): update Maven commands to install Liquibase snapshot with improved branch search and repository configuration
…0.23 to 0.10.22 to resolve compatibility issues
…2 to 0.10.23 for bug fixes and improvements

chore(pom.xml): remove liquibase-pro repository from liquibase-sdk-maven-plugin configuration as it is no longer needed
…ugin

The repo configuration in the liquibase plugin is not needed as it defaults to the current repository. Removing it improves the clarity and simplicity of the configuration.
…formation

chore(main.yml): remove commented out buildOverview commands to improve code readability
…t command

The command was removed as it was no longer needed and was causing unnecessary overhead during the build process.
…all snapshot Liquibase

The command `mvn liquibase-sdk:install-snapshot` is added to the workflow to install the snapshot version of Liquibase. This command takes the following parameters:
- `-Dliquibase.sdk.branchSearch=${{ steps.configure-build.outputs.liquibaseBranch }},master,main,develop`: This parameter specifies the branch search order for the Liquibase SDK. It searches for the specified branches in the given order to find the Liquibase SDK.
- `-Dliquibase.sdk.repo=liquibase/liquibase,liquibase/liquibase-pro`: This parameter specifies the repositories to search for the Liquibase SDK. It searches for the Liquibase SDK in the `liquibase/liquibase` and `liquibase/liquibase-pro` repositories.

This change ensures that the snapshot version of Liquibase is installed during the workflow execution.
Sayali M and others added 4 commits December 14, 2023 08:08
…he maven-scm-plugin

The liquibaseHome configuration is added to specify the location of the Liquibase binary. This allows the plugin to find and execute Liquibase commands.

The allowInstall configuration is added to enable the installation of Liquibase if it is not found in the specified liquibaseHome location. This ensures that Liquibase is available for the plugin to use.
Sayali M and others added 12 commits December 14, 2023 08:30
…T and install snapshot CLI

The changes in this commit add two new steps to the main.yml workflow file.

The first step uses the `mvn versions:set-property` command to set the `liquibase-core.version` property to `0-SNAPSHOT`. This is done to update the version of the liquibase-core library used in the project.

The second step uses the `mvn liquibase-sdk:install-snapshot-cli` command to install the snapshot CLI for the liquibase-sdk. This step also includes additional parameters to specify the branch search order and the repositories to search for the liquibase-sdk.

These changes are made to ensure that the liquibase-core version is set to the desired value and to install the necessary tools for working with the liquibase-sdk.
…ange permissions for bin directory

The commented out code is unnecessary and adds clutter to the workflow file. Removing it improves readability and maintainability.

Additionally, the step to change permissions for the bin directory was missing. This step is necessary to ensure that the bin directory has the correct permissions for the subsequent commands to execute successfully.
Update MySQL boolean behaviour from TinyInt(1) to TinyInt
* Bump org.postgresql:postgresql from 42.7.0 to 42.7.1

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.0 to 42.7.1.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](pgjdbc/pgjdbc@REL42.7.0...REL42.7.1)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump org.liquibase.ext:liquibase-sdk-maven-plugin

Bumps [org.liquibase.ext:liquibase-sdk-maven-plugin](https://github.com/liquibase/liquibase-sdk-maven-plugin) from 0.10.22 to 0.10.23.
- [Release notes](https://github.com/liquibase/liquibase-sdk-maven-plugin/releases)
- [Commits](liquibase/liquibase-sdk-maven-plugin@v0.10.22...v0.10.23)

---
updated-dependencies:
- dependency-name: org.liquibase.ext:liquibase-sdk-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump net.snowflake:snowflake-jdbc from 3.14.3 to 3.14.4

Bumps [net.snowflake:snowflake-jdbc](https://github.com/snowflakedb/snowflake-jdbc) from 3.14.3 to 3.14.4.
- [Release notes](https://github.com/snowflakedb/snowflake-jdbc/releases)
- [Changelog](https://github.com/snowflakedb/snowflake-jdbc/blob/master/CHANGELOG.rst)
- [Commits](snowflakedb/snowflake-jdbc@v3.14.3...v3.14.4)

---
updated-dependencies:
- dependency-name: net.snowflake:snowflake-jdbc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* DAT-16380 (#673)

* using -Dliquibase.sdk.workflowId=run-tests.yml

* use sdk-maven-plugin 0.10.23

* get liquibase --version

* get branch develop

* Trigger build

---------

Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>

* re-add the deleted code

* Update main.yml

* DAT-16387. fixes.

* DAT-16387. more fixes.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vitalii Makarchenkov <mail@vitaliimak.com>
Co-authored-by: Sayali M <sayali@Sayalis-MacBook-Pro>
Co-authored-by: Pavlo Tytarchuk <ptyta@softserveinc.com>
@KushnirykOleh KushnirykOleh self-requested a review December 18, 2023 12:46
Copy link
Contributor

@KushnirykOleh KushnirykOleh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we cannot merge this PR with Daniel's changes for TinyInt until liquibase-core is released.
Builds on the main branch in test-harness use the released version of liquibase-core

Copy link
Contributor

@KushnirykOleh KushnirykOleh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to merge after resolving the conflict

@sayaliM0412
Copy link
Contributor Author

good to merge after resolving the conflict

Conflicts resolved. Please verify

@sayaliM0412 sayaliM0412 merged commit a70bce9 into main Dec 20, 2023
105 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants