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.

Sign up for GitHub

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

Jump to bottom

Schema upgrade v5.2.0 #402

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Schema upgrade v5.2.0 #402

merged 1 commit into from
Oct 30, 2023

Conversation

VithikaS
Copy link
Collaborator

@VithikaS VithikaS commented Oct 30, 2023 •
edited
Loading

Description

Modified Purl field length in INTEGRITY_META_COMPONENT table
Dropped STATUS constraint check from INTEGRITY_META_COMPONENT table

Addressed Issue

Additional Details

Checklist

  • I have read and understand the contributing guidelines
  • This PR fixes a defect, and I have provided tests to verify that the fix is effective
  • This PR implements an enhancement, and I have provided tests to verify that it works as intended
  • This PR introduces changes to the database model, and I have added corresponding update logic
  • This PR introduces new or alters existing behavior, and I have updated the documentation accordingly

schema upgarde
f5174be 
Signed-off-by: vithikashukla <[email protected]>
@VithikaS VithikaS added the enhancement New feature or request label Oct 30, 2023
@nscuro nscuro merged commit 2a035b0 into main Oct 30, 2023
6 checks passed
@nscuro nscuro deleted the add-schema-upgrade branch October 30, 2023 14:02
sahibamittal added a commit that referenced this pull request Oct 31, 2023
@sahibamittal
Squashed commit of the following:
bbb4261 
commit fb5a520
Merge: 8944f92 805582b
Author: VithikaS <[email protected]>
Date:   Tue Oct 31 14:53:11 2023 +0000

    Merge pull request #410 from DependencyTrack/fix-integrity-meta-query

    fix query for fetching integrity data

commit 805582b
Author: vithikashukla <[email protected]>
Date:   Tue Oct 31 13:56:53 2023 +0000

    fix query for fetching integrity data

    Signed-off-by: vithikashukla <[email protected]>

commit 8944f92
Author: VithikaS <[email protected]>
Date:   Tue Oct 31 09:15:13 2023 +0000

    Integrity analysis if integrity metadata is present (#409)

commit cf6e732
Merge: a1ebb13 4111a37
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 19:02:05 2023 +0000

    Merge pull request #408 from DependencyTrack/remove-mockserver

    Remove `mockserver-netty` dependency

commit a1ebb13
Merge: 42acfab 3254511
Author: Niklas <[email protected]>
Date:   Mon Oct 30 17:16:49 2023 +0100

    Merge pull request #407 from DependencyTrack/dependabot/github_actions/aquasecurity/trivy-action-0.13.0

    Bump aquasecurity/trivy-action from 0.12.0 to 0.13.0

commit 42acfab
Merge: 529da26 0aee974
Author: Niklas <[email protected]>
Date:   Mon Oct 30 17:16:40 2023 +0100

    Merge pull request #406 from DependencyTrack/dependabot/github_actions/bufbuild/buf-setup-action-1.27.2

    Bump bufbuild/buf-setup-action from 1.27.1 to 1.27.2

commit 4111a37
Author: nscuro <[email protected]>
Date:   Mon Oct 30 16:55:56 2023 +0100

    Remove `mockserver-netty` dependency

    For some strange reason, removal of MockServer required addition of `javax.servlet-api`, even though it should come in via `alpine-parent` already.

    Signed-off-by: nscuro <[email protected]>

commit 529da26
Merge: 182cad7 34ef4a2
Author: Niklas <[email protected]>
Date:   Mon Oct 30 16:21:43 2023 +0100

    Merge pull request #405 from DependencyTrack/nscuro-patch-1

    Remove unused `frontend.version` property

commit 182cad7
Merge: 24f6d3a f38d11d
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 14:34:37 2023 +0000

    Merge pull request #404 from DependencyTrack/port-pr-3129

    Force downgrade of `logstash-logback-encoder` to `7.3`

commit 24f6d3a
Merge: ef5086b e9f0f4f
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 14:34:17 2023 +0000

    Merge pull request #403 from DependencyTrack/port-pr-3126

    Fix impossible SQL query conditions causing DB indexes to be bypassed

commit 3254511
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 30 14:30:22 2023 +0000

    Bump aquasecurity/trivy-action from 0.12.0 to 0.13.0

    Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.12.0 to 0.13.0.
    - [Release notes](https://github.com/aquasecurity/trivy-action/releases)
    - [Commits](aquasecurity/trivy-action@0.12.0...0.13.0)

    ---
    updated-dependencies:
    - dependency-name: aquasecurity/trivy-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 0aee974
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 30 14:30:18 2023 +0000

    Bump bufbuild/buf-setup-action from 1.27.1 to 1.27.2

    Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.27.1 to 1.27.2.
    - [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
    - [Commits](bufbuild/buf-setup-action@6bdfab1...1158f4f)

    ---
    updated-dependencies:
    - dependency-name: bufbuild/buf-setup-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 34ef4a2
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:18:32 2023 +0100

    Remove unused `frontend.version` property

    Signed-off-by: Niklas <[email protected]>

commit ef5086b
Merge: 2a035b0 4bb51d5
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:02:59 2023 +0100

    Merge pull request #400 from DependencyTrack/dependabot/maven/org.apache.maven.plugins-maven-clean-plugin-3.3.2

    Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2

commit 2a035b0
Merge: 4e15bd6 f5174be
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:02:41 2023 +0100

    Merge pull request #402 from DependencyTrack/add-schema-upgrade

    Schema upgrade v5.2.0

commit f38d11d
Author: nscuro <[email protected]>
Date:   Mon Oct 30 14:10:06 2023 +0100

    Force downgrade of `logstash-logback-encoder` to `7.3`

    Ported from DependencyTrack/dependency-track#3129

    Signed-off-by: nscuro <[email protected]>

commit e9f0f4f
Author: nscuro <[email protected]>
Date:   Mon Oct 30 14:06:42 2023 +0100

    Fix impossible SQL query conditions causing DB indexes to be bypassed

    Ported from DependencyTrack/dependency-track#3126

    Signed-off-by: nscuro <[email protected]>

commit f5174be
Author: vithikashukla <[email protected]>
Date:   Mon Oct 30 12:49:49 2023 +0000

    schema upgarde

    Signed-off-by: vithikashukla <[email protected]>

commit 4bb51d5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Oct 27 14:44:39 2023 +0000

    Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2

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

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

    Signed-off-by: dependabot[bot] <[email protected]>
mehab added a commit that referenced this pull request Nov 29, 2023
@sahibamittal @mehab
Convert Jdo to Sql query to fix sorting on components fields (#441)
9182e9d 
* add repo url in integrity meta information in endpoint

* Squashed commit of the following:

commit fb5a520
Merge: 8944f92 805582b
Author: VithikaS <[email protected]>
Date:   Tue Oct 31 14:53:11 2023 +0000

    Merge pull request #410 from DependencyTrack/fix-integrity-meta-query

    fix query for fetching integrity data

commit 805582b
Author: vithikashukla <[email protected]>
Date:   Tue Oct 31 13:56:53 2023 +0000

    fix query for fetching integrity data

    Signed-off-by: vithikashukla <[email protected]>

commit 8944f92
Author: VithikaS <[email protected]>
Date:   Tue Oct 31 09:15:13 2023 +0000

    Integrity analysis if integrity metadata is present (#409)

commit cf6e732
Merge: a1ebb13 4111a37
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 19:02:05 2023 +0000

    Merge pull request #408 from DependencyTrack/remove-mockserver

    Remove `mockserver-netty` dependency

commit a1ebb13
Merge: 42acfab 3254511
Author: Niklas <[email protected]>
Date:   Mon Oct 30 17:16:49 2023 +0100

    Merge pull request #407 from DependencyTrack/dependabot/github_actions/aquasecurity/trivy-action-0.13.0

    Bump aquasecurity/trivy-action from 0.12.0 to 0.13.0

commit 42acfab
Merge: 529da26 0aee974
Author: Niklas <[email protected]>
Date:   Mon Oct 30 17:16:40 2023 +0100

    Merge pull request #406 from DependencyTrack/dependabot/github_actions/bufbuild/buf-setup-action-1.27.2

    Bump bufbuild/buf-setup-action from 1.27.1 to 1.27.2

commit 4111a37
Author: nscuro <[email protected]>
Date:   Mon Oct 30 16:55:56 2023 +0100

    Remove `mockserver-netty` dependency

    For some strange reason, removal of MockServer required addition of `javax.servlet-api`, even though it should come in via `alpine-parent` already.

    Signed-off-by: nscuro <[email protected]>

commit 529da26
Merge: 182cad7 34ef4a2
Author: Niklas <[email protected]>
Date:   Mon Oct 30 16:21:43 2023 +0100

    Merge pull request #405 from DependencyTrack/nscuro-patch-1

    Remove unused `frontend.version` property

commit 182cad7
Merge: 24f6d3a f38d11d
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 14:34:37 2023 +0000

    Merge pull request #404 from DependencyTrack/port-pr-3129

    Force downgrade of `logstash-logback-encoder` to `7.3`

commit 24f6d3a
Merge: ef5086b e9f0f4f
Author: VithikaS <[email protected]>
Date:   Mon Oct 30 14:34:17 2023 +0000

    Merge pull request #403 from DependencyTrack/port-pr-3126

    Fix impossible SQL query conditions causing DB indexes to be bypassed

commit 3254511
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 30 14:30:22 2023 +0000

    Bump aquasecurity/trivy-action from 0.12.0 to 0.13.0

    Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.12.0 to 0.13.0.
    - [Release notes](https://github.com/aquasecurity/trivy-action/releases)
    - [Commits](aquasecurity/trivy-action@0.12.0...0.13.0)

    ---
    updated-dependencies:
    - dependency-name: aquasecurity/trivy-action
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 0aee974
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 30 14:30:18 2023 +0000

    Bump bufbuild/buf-setup-action from 1.27.1 to 1.27.2

    Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.27.1 to 1.27.2.
    - [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
    - [Commits](bufbuild/buf-setup-action@6bdfab1...1158f4f)

    ---
    updated-dependencies:
    - dependency-name: bufbuild/buf-setup-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 34ef4a2
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:18:32 2023 +0100

    Remove unused `frontend.version` property

    Signed-off-by: Niklas <[email protected]>

commit ef5086b
Merge: 2a035b0 4bb51d5
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:02:59 2023 +0100

    Merge pull request #400 from DependencyTrack/dependabot/maven/org.apache.maven.plugins-maven-clean-plugin-3.3.2

    Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2

commit 2a035b0
Merge: 4e15bd6 f5174be
Author: Niklas <[email protected]>
Date:   Mon Oct 30 15:02:41 2023 +0100

    Merge pull request #402 from DependencyTrack/add-schema-upgrade

    Schema upgrade v5.2.0

commit f38d11d
Author: nscuro <[email protected]>
Date:   Mon Oct 30 14:10:06 2023 +0100

    Force downgrade of `logstash-logback-encoder` to `7.3`

    Ported from DependencyTrack/dependency-track#3129

    Signed-off-by: nscuro <[email protected]>

commit e9f0f4f
Author: nscuro <[email protected]>
Date:   Mon Oct 30 14:06:42 2023 +0100

    Fix impossible SQL query conditions causing DB indexes to be bypassed

    Ported from DependencyTrack/dependency-track#3126

    Signed-off-by: nscuro <[email protected]>

commit f5174be
Author: vithikashukla <[email protected]>
Date:   Mon Oct 30 12:49:49 2023 +0000

    schema upgarde

    Signed-off-by: vithikashukla <[email protected]>

commit 4bb51d5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Oct 27 14:44:39 2023 +0000

    Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2

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

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

    Signed-off-by: dependabot[bot] <[email protected]>

* WIP

* WIP 3

* Update ComponentQueryManager.java

* component projection added for SQL

* added test for ComponentQueryManager with postgres

* add test and projection mapping

* changed list to paginated result

* Update ComponentQueryManager.java

* fix mapping of postgres byte array

* fix tests

* Update ComponentQueryManager.java

* Update ComponentQueryManager.java

* addressed PR comments

* Update ComponentResourcePostgresTest.java

* fix transient object warnings

* Update FindingResource.java

---------

Signed-off-by: mehab <[email protected]>
Co-authored-by: mehab <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nscuro nscuro nscuro approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@VithikaS @nscuro