[go: nahoru, domu]
Skip to content

Commit

Permalink
Update to latest bluebrint
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Raible committed Feb 28, 2022
1 parent 2c528c9 commit 3cc3f3a
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 40 deletions.
1 change: 1 addition & 0 deletions postgres-webflux/src/main/java/com/mycompany/myapp/PostgresApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
com.zaxxer.hikari.HikariDataSource.class,
liquibase.change.core.LoadDataColumnConfig.class,
org.hibernate.type.TextType.class,
java.util.HashSet.class
}, typeNames = "com.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry[]")
@SpringBootApplication
@EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class })
Expand Down
2 changes: 1 addition & 1 deletion spring-native-webflux/.yo-rc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"entities": [],
"entitySuffix": "",
"jhiPrefix": "jhi",
"jhipsterVersion": "7.6.0",
"jhipsterVersion": "7.7.0",
"languages": ["en", "fr"],
"messageBroker": false,
"monorepository": true,
Expand Down
16 changes: 8 additions & 8 deletions spring-native-webflux/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# jhipster

This application was generated using JHipster 7.6.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v7.6.0](https://www.jhipster.tech/documentation-archive/v7.6.0).
This application was generated using JHipster 7.7.0, you can find documentation and help at [https://www.jhipster.tech](https://www.jhipster.tech).

## Project Structure

Expand Down Expand Up @@ -253,12 +253,12 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.

[jhipster homepage and latest documentation]: https://www.jhipster.tech
[jhipster 7.6.0 archive]: https://www.jhipster.tech/documentation-archive/v7.6.0
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v7.6.0/development/
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v7.6.0/docker-compose
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v7.6.0/production/
[running tests page]: https://www.jhipster.tech/documentation-archive/v7.6.0/running-tests/
[code quality page]: https://www.jhipster.tech/documentation-archive/v7.6.0/code-quality/
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v7.6.0/setting-up-ci/
[jhipster 7.7.0 archive]: https://www.jhipster.tech
[using jhipster in development]: https://www.jhipster.tech/development/
[using docker and docker-compose]: https://www.jhipster.tech/docker-compose
[using jhipster in production]: https://www.jhipster.tech/production/
[running tests page]: https://www.jhipster.tech/running-tests/
[code quality page]: https://www.jhipster.tech/code-quality/
[setting up continuous integration]: https://www.jhipster.tech/setting-up-ci/
[node.js]: https://nodejs.org/
[npm]: https://www.npmjs.com/
14 changes: 7 additions & 7 deletions spring-native-webflux/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions spring-native-webflux/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"docker:db:up": "echo \"Docker for db no not configured for application jhipster\"",
"docker:keycloak:down": "docker-compose -f src/main/docker/keycloak.yml down -v --remove-orphans",
"docker:keycloak:up": "docker-compose -f src/main/docker/keycloak.yml up -d",
"docker:others:await": "echo \"Waiting for keycloak to start\" && wait-on http-get://localhost:9080/auth/realms/jhipster -t 30000 && echo \"keycloak started\" || echo \"keycloak not running, make sure oauth2 server is running\"",
"docker:others:await": "echo \"Waiting for keycloak to start\" && wait-on -t 180000 http-get://localhost:9080/auth/realms/jhipster && echo \"keycloak started\" || echo \"keycloak not running, make sure oauth2 server is running\"",
"docker:others:down": "npm run docker:keycloak:down",
"predocker:others:up": "",
"docker:others:up": "npm run docker:keycloak:up",
Expand Down Expand Up @@ -55,7 +55,7 @@
"prettier-plugin-packagejson": "2.2.15"
},
"engines": {
"node": ">=16.13.1"
"node": ">=16.14.0"
},
"cacheDirectories": [
"node_modules"
Expand Down
22 changes: 8 additions & 14 deletions spring-native-webflux/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
<description>Description for jhipster</description>

<repositories>
<repository>
<id>ossrh-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>spring-releases</id>
<url>https://repo.spring.io/release</url>
Expand Down Expand Up @@ -57,9 +50,10 @@
<!-- These remain empty unless the corresponding profile is active -->
<profile.api-docs />
<profile.tls />
<profile.e2e />

<!-- Dependency versions -->
<jhipster-dependencies.version>7.6.1-SNAPSHOT</jhipster-dependencies.version>
<jhipster-dependencies.version>7.7.0</jhipster-dependencies.version>
<!-- The spring-boot version should match the one managed by
https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
<spring-boot.version>2.6.3</spring-boot.version>
Expand All @@ -68,19 +62,19 @@
<mapstruct.version>1.4.2.Final</mapstruct.version>
<!-- Plugin versions -->
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-site-plugin.version>3.10.0</maven-site-plugin.version>
<maven-site-plugin.version>3.11.0</maven-site-plugin.version>
<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<checkstyle.version>9.2.1</checkstyle.version>
<checkstyle.version>9.3</checkstyle.version>
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
<git-commit-id-plugin.version>5.0.0</git-commit-id-plugin.version>
<modernizer-maven-plugin.version>2.3.0</modernizer-maven-plugin.version>
Expand Down Expand Up @@ -262,7 +256,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-native</artifactId>
<version>1.6.5</version>
<version>1.6.6</version>
</dependency>
<!-- jhipster-needle-maven-add-dependency -->
</dependencies>
Expand Down Expand Up @@ -802,7 +796,7 @@
</build>
<properties>
<!-- default Spring profiles -->
<spring.profiles.active>prod${profile.api-docs}${profile.tls}</spring.profiles.active>
<spring.profiles.active>prod${profile.api-docs}${profile.tls}${profile.e2e}</spring.profiles.active>
</properties>
</profile>
<profile>
Expand Down
4 changes: 2 additions & 2 deletions spring-native-webflux/src/main/docker/monitoring.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.8'
services:
jhipster-prometheus:
image: prom/prometheus:v2.32.1
image: prom/prometheus:v2.33.3
volumes:
- ./prometheus/:/etc/prometheus/
command:
Expand All @@ -15,7 +15,7 @@ services:
# grafana/provisioning/datasources/datasource.yml
network_mode: 'host' # to test locally running service
jhipster-grafana:
image: grafana/grafana:8.3.3
image: grafana/grafana:8.4.1
volumes:
- ./grafana/provisioning/:/etc/grafana/provisioning/
environment:
Expand Down
2 changes: 1 addition & 1 deletion spring-native-webflux/src/main/docker/sonar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3.8'
services:
jhipster-sonar:
image: sonarqube:9.2.4-community
image: sonarqube:9.3.0-community
# Authentication is turned off for out of the box experience while trying out SonarQube
# For real use cases delete sonar.forceAuthentication variable or set sonar.forceAuthentication=true
environment:
Expand Down
2 changes: 1 addition & 1 deletion spring-native-webflux/src/main/java/com/mycompany/myapp/GeneratedByJHipster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.lang.annotation.Target;
import javax.annotation.Generated;

@Generated(value = "JHipster", comments = "Generated by JHipster 7.6.0")
@Generated(value = "JHipster", comments = "Generated by JHipster 7.7.0")
@Retention(RetentionPolicy.SOURCE)
@Target({ ElementType.TYPE })
public @interface GeneratedByJHipster {
Expand Down
3 changes: 2 additions & 1 deletion spring-native-webflux/src/main/java/com/mycompany/myapp/config/SecurityConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.springframework.security.web.server.csrf.CookieServerCsrfTokenRepository;
import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
import org.springframework.security.web.server.header.ReferrerPolicyServerHttpHeadersWriter;
import org.springframework.security.web.server.header.XFrameOptionsServerHttpHeadersWriter.Mode;
import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.OrServerWebExchangeMatcher;
import org.zalando.problem.spring.webflux.advice.security.SecurityProblemSupport;
Expand Down Expand Up @@ -82,7 +83,7 @@ public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http)
.and()
.permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
.and()
.frameOptions().disable()
.frameOptions().mode(Mode.DENY)
.and()
.authorizeExchange()
.pathMatchers("/api/authenticate").permitAll()
Expand Down
Binary file modified spring-native-webflux/src/main/resources/config/tls/keystore.p12
View file
Binary file not shown.
9 changes: 6 additions & 3 deletions spring-native-webflux/src/test/java/com/mycompany/myapp/TechnicalStructureTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ class TechnicalStructureTest {
static final ArchRule respectsTechnicalArchitectureLayers = layeredArchitecture()
.layer("Config").definedBy("..config..")
.layer("Web").definedBy("..web..")
.layer("Service").definedBy("..service..")
.optionalLayer("Service").definedBy("..service..")
.layer("Security").definedBy("..security..")

.whereLayer("Config").mayNotBeAccessedByAnyLayer()
.whereLayer("Web").mayOnlyBeAccessedByLayers("Config")
.whereLayer("Service").mayOnlyBeAccessedByLayers("Web", "Config")
.whereLayer("Security").mayOnlyBeAccessedByLayers("Web", "Service", "Config")
.whereLayer("Security").mayOnlyBeAccessedByLayers("Config", "Service", "Web")

.ignoreDependency(belongToAnyOf(JhipsterApp.class), alwaysTrue());
.ignoreDependency(belongToAnyOf(JhipsterApp.class), alwaysTrue())
.ignoreDependency(alwaysTrue(), belongToAnyOf(
com.mycompany.myapp.config.ApplicationProperties.class
));
}

0 comments on commit 3cc3f3a

Please sign in to comment.