Skip to content

Commit

Permalink
Merge pull request #873 from assimbly/next
Browse files Browse the repository at this point in the history
Next
  • Loading branch information
skin27 authored Dec 17, 2024
2 parents d5cd109 + f459765 commit aabf9fc
Show file tree
Hide file tree
Showing 10 changed files with 428 additions and 445 deletions.
389 changes: 89 additions & 300 deletions build.gradle

Large diffs are not rendered by default.

366 changes: 279 additions & 87 deletions build.gradle.optimized → build.gradle.old

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ type=FULL
newVersion=0.0.0
systemProp.ASSIMBLY_ENV=test
# Dependency=
spring_boot_version=3.3.5
hibernate_version=6.6.1.Final
mapstruct_version=1.6.2
spring_boot_version=3.4.0
hibernate_version=6.6.3.Final
mapstruct_version=1.6.3
archunitJunit5Version=1.3.0
log4j2_mock_version=0.0.2
liquibase_version=4.29.2
liquibase_version=4.30.0
liquibaseTaskPrefix=liquibase
# gradle plugin=
jib_plugin_version=3.4.4
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
93 changes: 47 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,83 +73,84 @@
"packaging": "jar"
},
"dependencies": {
"@angular/animations": "18.0.4",
"@angular/common": "18.0.4",
"@angular/compiler": "18.0.4",
"@angular/core": "18.0.4",
"@angular/forms": "18.0.4",
"@angular/localize": "18.0.4",
"@angular/platform-browser": "18.0.4",
"@angular/platform-browser-dynamic": "18.0.4",
"@angular/router": "18.0.4",
"@angular/animations": "18.2.9",
"@angular/common": "18.2.9",
"@angular/compiler": "18.2.9",
"@angular/core": "18.2.9",
"@angular/forms": "18.2.9",
"@angular/localize": "18.2.9",
"@angular/platform-browser": "18.2.9",
"@angular/platform-browser-dynamic": "18.2.9",
"@angular/router": "18.2.9",
"@ctrl/ngx-codemirror": "7.0.0",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@ng-bootstrap/ng-bootstrap": "17.0.0",
"@ng-select/ng-select": "13.7.1",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@ng-bootstrap/ng-bootstrap": "17.0.1",
"@ng-select/ng-select": "13.9.1",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@popperjs/core": "2.11.8",
"autoprefixer": "10.4.17",
"bootstrap": "5.3.3",
"codemirror": "5.65.17",
"dayjs": "1.11.11",
"codemirror": "5.65.18",
"dayjs": "1.11.13",
"file-saver": "^1.3.8",
"ngx-bootstrap": "18.0.0",
"ngx-cookie-service": "18.0.0",
"ngx-infinite-scroll": "18.0.0",
"ngx-webstorage": "18.0.0",
"rxjs": "7.8.1",
"swagger-ui-dist": "5.17.1",
"tslib": "2.6.3",
"zone.js": "0.14.7"
"swagger-ui-dist": "5.18.2",
"tslib": "2.8.0",
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-builders/custom-webpack": "18.0.0",
"@angular-builders/jest": "18.0.0",
"@angular-devkit/build-angular": "18.0.5",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular/cli": "18.0.5",
"@angular/compiler-cli": "18.0.4",
"@angular/service-worker": "18.0.4",
"@types/jest": "29.5.12",
"@angular-devkit/build-angular": "18.2.12",
"@angular/cli": "18.2.10",
"@angular/compiler-cli": "18.2.9",
"@angular/service-worker": "18.2.9",
"@types/jest": "29.5.14",
"@types/node": "20.11.25",
"@typescript-eslint/eslint-plugin": "7.13.1",
"@typescript-eslint/parser": "7.13.1",
"browser-sync": "3.0.2",
"angular-eslint": "18.4.0",
"browser-sync": "3.0.3",
"browser-sync-webpack-plugin": "2.3.0",
"buffer": "6.0.3",
"concurrently": "8.2.2",
"concurrently": "9.0.1",
"copy-webpack-plugin": "12.0.2",
"cypress": "13.12.0",
"cypress": "13.15.1",
"cypress-audit": "1.1.0",
"eslint": "8.57.0",
"eslint": "9.13.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "3.3.0",
"eslint-plugin-cypress": "4.0.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-webpack-plugin": "4.2.0",
"folder-hash": "4.0.4",
"generator-jhipster": "8.6.0",
"husky": "9.0.11",
"generator-jhipster": "8.7.3",
"globals": "15.11.0",
"husky": "9.1.6",
"jest": "29.7.0",
"jest-date-mock": "1.0.10",
"jest-environment-jsdom": "29.7.0",
"jest-junit": "16.0.0",
"jest-preset-angular": "14.1.1",
"jest-preset-angular": "14.2.4",
"jest-sonar": "0.2.16",
"lighthouse": "12.1.0",
"lint-staged": "15.2.7",
"lighthouse": "12.2.1",
"lint-staged": "15.2.10",
"merge-jsons-webpack-plugin": "2.0.1",
"prettier": "3.3.2",
"prettier-plugin-java": "2.6.0",
"prettier-plugin-packagejson": "2.5.0",
"rimraf": "5.0.7",
"prettier": "3.3.3",
"prettier-plugin-java": "2.6.5",
"prettier-plugin-packagejson": "2.5.3",
"rimraf": "5.0.8",
"swagger-ui-dist": "5.17.14",
"ts-jest": "29.1.5",
"typescript": "5.4.5",
"wait-on": "7.2.0",
"ts-jest": "29.2.5",
"typescript": "5.5.4",
"typescript-eslint": "8.12.2",
"wait-on": "8.0.1",
"webpack-bundle-analyzer": "4.10.2",
"webpack-merge": "5.10.0",
"webpack-merge": "6.0.1",
"webpack-notifier": "1.15.0"
},
"engines": {
Expand All @@ -159,7 +160,7 @@
"node_modules"
],
"overrides": {
"browser-sync": "3.0.2",
"webpack": "5.92.1"
"browser-sync": "3.0.3",
"webpack": "5.95.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, MvcRequestMatcher.Buil
.contentSecurityPolicy(csp -> csp.policyDirectives(jHipsterProperties.getSecurity().getContentSecurityPolicy()))
.frameOptions(FrameOptionsConfig::sameOrigin)
.referrerPolicy(referrer -> referrer.policy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN))
.permissionsPolicy(permissions ->
permissions.policy(
"camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()"
)
)
.permissionsPolicyHeader(Customizer.withDefaults())
);

if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public SpringLiquibase liquibase(
dataSourceProperties
);
liquibase.setChangeLog("classpath:config/liquibase/master.xml");
liquibase.setContexts(liquibaseProperties.getContexts());
liquibase.setContexts(String.valueOf(liquibaseProperties.getContexts()));
liquibase.setDefaultSchema(liquibaseProperties.getDefaultSchema());
liquibase.setLiquibaseSchema(liquibaseProperties.getLiquibaseSchema());
liquibase.setLiquibaseTablespace(liquibaseProperties.getLiquibaseTablespace());
liquibase.setDatabaseChangeLogLockTable(liquibaseProperties.getDatabaseChangeLogLockTable());
liquibase.setDatabaseChangeLogTable(liquibaseProperties.getDatabaseChangeLogTable());
liquibase.setDropFirst(liquibaseProperties.isDropFirst());
liquibase.setLabelFilter(liquibaseProperties.getLabelFilter());
liquibase.setLabelFilter(String.valueOf(liquibaseProperties.getLabelFilter()));
liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ public void put(EnvironmentValue environmentValue) {
values.add(environmentValue);
}

@SuppressWarnings("unchecked")
public static TenantVariable fromDocument(Document document) {

TenantVariable tenantVariable = new TenantVariable();
tenantVariable.set_id(document.getObjectId(ID_FIELD));
if(document.getString(TYPE_FIELD) != null) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ management:
enabled: true
jolokia:
sensitive: false
detectors:
activemq: false
info:
git:
mode: full
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/app/entities/flow/flow-row.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ export class FlowRowComponent implements OnInit {
}

start() {

this.flowStatus = 'Starting';
this.isFlowStatusOK = true;
this.disableActionBtns = true;
Expand Down

0 comments on commit aabf9fc

Please sign in to comment.