Skip to content

[risk=no] wip #1540

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[risk=no] wip #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d1cc9
wip
SrushtiGangireddy Aug 27, 2025
e0eeea1
refresh dependencies
SrushtiGangireddy Aug 28, 2025
9078e61
refresh dependencies
SrushtiGangireddy Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
name: Scan dependencies for vulnerabilities
working_directory: ~/data-browser/public-api
command: |
./project.rb gradle dependencyCheckAnalyze --info
./gradlew dependencyCheckAnalyze --info

public-ui-build-test:
<<: *defaults
Expand Down
12 changes: 9 additions & 3 deletions public-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
SPRING_FRAMEWORK_VERSION = '6.1.5'
SPRING_SECURITY_VERSION = '6.2.3'
LOGBACK_VERSION = '1.5.5'
JACKSON_VERSION = '2.16.1'
JACKSON_VERSION = '2.18.2'
SPRING_DEPENDENCY_MANAGEMENT_VERSION = '1.0.13.RELEASE'
OKHTTP_VERSION = '4.12.0'
LIQUIBASE_VERSION = '4.27.0'
Expand Down Expand Up @@ -37,7 +37,7 @@ plugins {
id 'idea'
id 'war'
id 'org.springframework.boot' version '3.2.0'
id 'org.owasp.dependencycheck' version '7.4.4'
id 'org.owasp.dependencycheck' version '12.1.0'
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
id 'org.hidetake.swagger.generator' version '2.19.2'
id 'com.google.cloud.tools.appengine-appenginewebxml' version '2.8.0'
Expand Down Expand Up @@ -237,7 +237,7 @@ dependencies {
implementation 'com.google.guava:guava:32.0.1-jre'
implementation 'com.google.oauth-client:google-oauth-client-jetty:1.34.1'
implementation 'com.google.protobuf:protobuf-java:3.25.3'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20211018.2'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
implementation "org.hibernate.orm:hibernate-core:$project.ext.HIBERNATE_VERSION"
implementation "org.hibernate.orm:hibernate-community-dialects:$project.ext.HIBERNATE_VERSION"
implementation('org.apache.tomcat:tomcat-jdbc:10.0.23')
Expand Down Expand Up @@ -452,6 +452,12 @@ dependencies {
}
}

dependencyCheck {
nvd {
apiKey = System.getenv('NVD_API_KEY')
}
}


group = 'org.pmiops.allofus.workbench'
version = '0.1.0'
Expand Down
13 changes: 8 additions & 5 deletions public-api/libproject/devstart.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,10 @@ def run_local_migrations()
Dir.chdir('db-cdr/generate-cdr') do
common.run_inline %W{./init-new-cdr-db.sh --cdr-db-name public}
end
common.run_inline %W{./gradlew :loadConfig -Pconfig_key=main -Pconfig_file=config/config_local.json}
common.run_inline %W{rm -rf /home/circleci/.gradle/caches/jars-9/}
common.run_inline %W{./gradlew :loadConfig -Pconfig_key=main -Pconfig_file=config/config_local.json --refresh-dependencies}

common.run_inline %W{rm -rf /home/circleci/.gradle/caches/jars-9/}
common.run_inline %W{./gradlew :loadConfig -Pconfig_key=cdrBigQuerySchema -Pconfig_file=config/cdm/cdm_5_2.json}
common.run_inline %W{./gradlew :updateCdrConfig -PappArgs=['config/cdr_config_local.json',false]}
end
Expand Down Expand Up @@ -855,7 +858,7 @@ def update_cdr_config_options(cmd_name, args)
def update_cdr_config_for_project(cdr_config_file, dry_run)
common = Common.new
common.run_inline %W{
gradle updateCdrConfig
./gradlew updateCdrConfig
-PappArgs=['#{cdr_config_file}',#{dry_run}]}
end

Expand Down Expand Up @@ -1006,7 +1009,7 @@ def migrate_database(dry_run = false)
common = Common.new
common.status "Migrating main database..."
Dir.chdir("db") do
run_inline_or_log(dry_run, %W{gradle --info update -PrunList=main})
run_inline_or_log(dry_run, %W{./gradlew update -PrunList=main})
end
end

Expand All @@ -1026,8 +1029,8 @@ def load_config(project, dry_run = false)

common = Common.new
common.status "Loading #{config_json} into database..."
run_inline_or_log(dry_run, %W{gradle --info loadConfig -Pconfig_key=main -Pconfig_file=config/#{config_json}})
run_inline_or_log(dry_run, %W{gradle --info loadConfig -Pconfig_key=cdrBigQuerySchema -Pconfig_file=config/cdm/cdm_5_2.json})
run_inline_or_log(dry_run, %W{./gradlew loadConfig -Pconfig_key=main -Pconfig_file=config/#{config_json}})
run_inline_or_log(dry_run, %W{./gradlew loadConfig -Pconfig_key=cdrBigQuerySchema -Pconfig_file=config/cdm/cdm_5_2.json})
end

def with_cloud_proxy_and_db(gcc, service_account = nil, key_file = nil)
Expand Down