Skip to content

Commit

Permalink
Release v1.22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalgrimaud committed Nov 11, 2024
1 parent cca84f8 commit 4c418e8
Show file tree
Hide file tree
Showing 45 changed files with 837 additions and 811 deletions.
583 changes: 309 additions & 274 deletions .jhipster/modules/history.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ npm install
## Start up

```bash
./mvnw
./mvnw
```

```bash
Expand All @@ -43,7 +43,6 @@ docker compose -f src/main/docker/postgresql.yml up -d
docker compose -f src/main/docker/keycloak.yml up -d
```


<!-- jhipster-needle-startupCommand -->

## Documentation
Expand Down
8 changes: 1 addition & 7 deletions documentation/cucumber.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ public class SimpleSteps {

@Then("I get simple response with name {string} and age {int}")
public void shouldGetResponse(String name, int age) {
assertThatLastResponse()
.hasOkStatus()
.hasElement("$.name")
.withValue(name)
.and()
.hasElement("$.age")
.withValue(age);
assertThatLastResponse().hasOkStatus().hasElement("$.name").withValue(name).and().hasElement("$.age").withValue(age);
}
}

Expand Down
1 change: 1 addition & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default typescript.config(
},
rules: {
quotes: ['error', 'single', { avoidEscape: true }],
'@typescript-eslint/consistent-type-imports': 'error',
'@typescript-eslint/no-empty-object-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'vue/html-self-closing': 'off',
Expand Down
752 changes: 395 additions & 357 deletions package-lock.json

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"private": true,
"description": "JHipster Lite Sample Application",
"license": "UNLICENSED",
"engines": {
"node": ">=20"
},
"type": "module",
"scripts": {
"build": "npm-run-all build:*",
"build:tsc": "vue-tsc -p tsconfig.build.json --noEmit",
Expand All @@ -25,42 +23,44 @@
"prettier:format": "prettier --write .",
"prepare": "husky"
},
"dependencies": {
"axios": "1.7.7",
"piqure": "2.1.1",
"vue": "3.5.12",
"vue-router": "4.4.5"
},
"devDependencies": {
"@prettier/plugin-xml": "3.4.1",
"@types/sinon": "17.0.3",
"@typescript-eslint/eslint-plugin": "8.13.0",
"@typescript-eslint/parser": "8.13.0",
"@vitejs/plugin-vue": "5.1.4",
"@vitest/coverage-istanbul": "2.1.4",
"@vue/test-utils": "2.4.6",
"@vue/tsconfig": "0.5.1",
"eslint-plugin-vue": "9.29.1",
"jsdom": "25.0.1",
"vite": "5.4.9",
"vue-tsc": "2.1.6",
"@types/sinon": "17.0.3",
"sinon": "19.0.2",
"typescript": "5.6.2",
"@typescript-eslint/eslint-plugin": "8.11.0",
"@typescript-eslint/parser": "8.11.0",
"@vitest/coverage-istanbul": "2.1.3",
"eslint": "9.13.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"globals": "15.11.0",
"npm-run-all2": "7.0.0",
"typescript-eslint": "8.11.0",
"vite-tsconfig-paths": "5.0.1",
"vitest": "2.1.3",
"vitest-sonar-reporter": "2.0.0",
"@prettier/plugin-xml": "3.4.1",
"eslint-plugin-vue": "9.30.0",
"globals": "15.12.0",
"husky": "9.1.6",
"jsdom": "25.0.1",
"lint-staged": "15.2.10",
"npm-run-all2": "7.0.1",
"prettier": "3.3.3",
"prettier-plugin-gherkin": "3.1.0",
"prettier-plugin-java": "2.6.4",
"prettier-plugin-java": "2.6.5",
"prettier-plugin-organize-imports": "4.1.0",
"prettier-plugin-packagejson": "2.5.3",
"husky": "9.1.6",
"lint-staged": "15.2.10"
"sinon": "19.0.2",
"typescript": "5.6.2",
"typescript-eslint": "8.13.0",
"vite": "5.4.10",
"vite-tsconfig-paths": "5.1.0",
"vitest": "2.1.4",
"vitest-sonar-reporter": "2.0.0",
"vue-tsc": "2.1.10"
},
"type": "module",
"dependencies": {
"vue": "3.5.12",
"axios": "1.7.7",
"vue-router": "4.4.5",
"piqure": "2.1.1"
"engines": {
"node": ">=22"
}
}
22 changes: 12 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8" ?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>4.0.0</modelVersion>

<groupId>tech.jhipster.lite.sample</groupId>
Expand Down Expand Up @@ -173,13 +177,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.version>3.6.3</maven.version>




<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<surefire-plugin.version>3.5.1</surefire-plugin.version>
<failsafe-plugin.version>3.5.1</failsafe-plugin.version>
<surefire-plugin.version>3.5.2</surefire-plugin.version>
<failsafe-plugin.version>3.5.2</failsafe-plugin.version>
<jacoco.version>0.8.11</jacoco.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<spring-boot.version>3.3.5</spring-boot.version>
Expand All @@ -188,11 +190,11 @@
<git-commit-id-plugin.version>9.0.1</git-commit-id-plugin.version>
<frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
<npm.version>10.9.0</npm.version>
<node.version>v20.18.0</node.version>
<node.version>v22.11.0</node.version>
<properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
<sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
<sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
<testcontainers.version>1.20.3</testcontainers.version>
<liquibase.version>4.29.2</liquibase.version>
<liquibase.version>4.30.0</liquibase.version>
<springdoc-openapi-starter-webmvc.version>2.6.0</springdoc-openapi-starter-webmvc.version>
<cucumber.version>7.20.1</cucumber.version>
<json-web-token.version>0.12.6</json-web-token.version>
Expand Down
16 changes: 6 additions & 10 deletions sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ sonar.exclusions=\
target/classes/static/**/*.*,\
src/main/webapp/app/index.tsx,\
src/main/webapp/main.ts
sonar.test.exclusions=\
src/test/**/PackageSettings.java

sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi,S2301,S7027
sonar.issue.ignore.multicriteria=S117,S119,S125_1,S125_2,S3437,S4502,S4684,S4032,S5778,S6206,S6437,S6564,UndocumentedApi,S2301,S7027

# Rule: Local variable and method parameter names should comply with a naming convention
# Handled with checkstyle. Should be revisited with java 25 once Unnamed Patterns and Variables are available (JEP 443)
Expand Down Expand Up @@ -62,10 +60,6 @@ sonar.issue.ignore.multicriteria.S4032.ruleKey=java:S4032
sonar.issue.ignore.multicriteria.S5778.resourceKey=src/test/java/**/*
sonar.issue.ignore.multicriteria.S5778.ruleKey=java:S5778

# Rule: Deprecated code should be removed
sonar.issue.ignore.multicriteria.S1133.resourceKey=src/main/java/**/*
sonar.issue.ignore.multicriteria.S1133.ruleKey=java:S1133

# Rule: Use record when possible in primary
sonar.issue.ignore.multicriteria.S6206.resourceKey=src/main/java/**/infrastructure/primary/**/*
sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
Expand All @@ -74,9 +68,11 @@ sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
sonar.issue.ignore.multicriteria.S6437.resourceKey=src/main/resources/config/application.yml
sonar.issue.ignore.multicriteria.S6437.ruleKey=java:S6437

# Rule: Delete commented out code in liquibase example
sonar.issue.ignore.multicriteria.S125.resourceKey=src/main/resources/config/liquibase/master.xml
sonar.issue.ignore.multicriteria.S125.ruleKey=xml:S125
# Rule: Sections of code should not be commented out
sonar.issue.ignore.multicriteria.S125_1.ruleKey=xml:S125
sonar.issue.ignore.multicriteria.S125_1.resourceKey=**/logback-spring.xml
sonar.issue.ignore.multicriteria.S125_2.ruleKey=xml:S125
sonar.issue.ignore.multicriteria.S125_2.resourceKey=**/config/liquibase/master.xml

# Rule: Remove this redundant type alias and replace its occurrences with "string"
sonar.issue.ignore.multicriteria.S6564.resourceKey=src/main/webapp/**/*
Expand Down
4 changes: 2 additions & 2 deletions src/main/docker/keycloak-realm-config/jhipster-realm.json
Original file line number Diff line number Diff line change
Expand Up @@ -1807,7 +1807,7 @@
{
"id": "da7d3a39-7077-4354-9ffc-5b9f79fbaf0d",
"alias": "Verify Existing Account by Re-authentication",
"description": "Reauthentication of existing account",
"description": "Re-authentication of existing account",
"providerId": "basic-flow",
"topLevel": false,
"builtIn": true,
Expand Down Expand Up @@ -2267,7 +2267,7 @@
"clientOfflineSessionIdleTimeout": "0",
"cibaInterval": "5"
},
"keycloakVersion": "26.0.2",
"keycloakVersion": "26.0.5",
"userManagedAccessAllowed": false,
"clientProfiles": {
"profiles": []
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/keycloak.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This configuration is intended for development purpose, it's **your** responsibility to harden it for production
services:
keycloak:
image: quay.io/keycloak/keycloak:26.0.2
image: quay.io/keycloak/keycloak:26.0.5
command: 'start-dev --import-realm'
volumes:
- ./keycloak-realm-config:/opt/keycloak/data/import
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tech.jhipster.lite.sample.account.application;

import tech.jhipster.lite.sample.account.domain.Account;
import tech.jhipster.lite.sample.account.domain.AccountsRepository;
import java.util.Optional;
import org.springframework.stereotype.Service;
import tech.jhipster.lite.sample.account.domain.Account;
import tech.jhipster.lite.sample.account.domain.AccountsRepository;

@Service
public class AccountsApplicationService {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package tech.jhipster.lite.sample.account.infrastructure.primary;

import tech.jhipster.lite.sample.account.application.AccountsApplicationService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import tech.jhipster.lite.sample.account.application.AccountsApplicationService;

@RestController
@Tag(name = "Accounts")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package tech.jhipster.lite.sample.account.infrastructure.primary;

import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
import java.util.Collection;

import tech.jhipster.lite.sample.account.domain.Account;
import tech.jhipster.lite.sample.shared.authentication.domain.Role;

import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;

@Schema(name = "user", description = "Information for an user")
final class RestAccount {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tech.jhipster.lite.sample.account.infrastructure.secondary;

import tech.jhipster.lite.sample.account.domain.Account;
import tech.jhipster.lite.sample.account.domain.AccountsRepository;
import java.util.Optional;
import org.springframework.stereotype.Repository;
import tech.jhipster.lite.sample.account.domain.Account;
import tech.jhipster.lite.sample.account.domain.AccountsRepository;

@Repository
class OAuth2AccountsRepository implements AccountsRepository {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package tech.jhipster.lite.sample.account.infrastructure.secondary;

import tech.jhipster.lite.sample.account.domain.Account;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand All @@ -10,6 +9,7 @@
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
import org.springframework.stereotype.Service;
import tech.jhipster.lite.sample.account.domain.Account;

@Service
class OAuth2AuthenticationReader {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package tech.jhipster.lite.sample.sample.infrastructure.secondary;

import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
import org.springframework.stereotype.Repository;
import tech.jhipster.lite.sample.sample.domain.BeerId;
import tech.jhipster.lite.sample.sample.domain.beer.Beer;
import tech.jhipster.lite.sample.sample.domain.beer.BeerSellingState;
import tech.jhipster.lite.sample.sample.domain.beer.Beers;
import tech.jhipster.lite.sample.sample.domain.beer.BeersRepository;
import tech.jhipster.lite.sample.shared.error.domain.Assert;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
import org.springframework.stereotype.Repository;

@Repository
class InMemoryBeersRepository implements BeersRepository {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import tech.jhipster.lite.sample.shared.memoizer.domain.Memoizers;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand All @@ -21,6 +20,7 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import tech.jhipster.lite.sample.shared.memoizer.domain.Memoizers;

/**
* Claim converter to add custom claims by retrieving the user from the userinfo endpoint.
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ management:
base-path: /management
exposure:
include:
- configprops
- env
- health
- info
- logfile
- loggers
- threaddump
- configprops
- env
- health
- info
- logfile
- loggers
- threaddump
info:
env:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/env.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="vite/client" />

declare module '*.vue' {
import { DefineComponent } from 'vue';
import type DefineComponent from 'vue';
const component: DefineComponent<{}, {}, any>;
export default component;
}
Loading

0 comments on commit 4c418e8

Please sign in to comment.