Merge branch 'master' of https://github.com/Maiklins/tutorials into JAVA-7244-Review_log_statements_for_projects

Conflicts: algorithms-searching/src/test/java/com/baeldung/algorithms/quadtree/QuadTreeSearchUnitTest.java
2021-10-31 20:54:51 +01:00
parent 72f31df764 789b7267be
commit e3aebd9c10
767 changed files with 29744 additions and 20414 deletions
@@ -107,7 +107,6 @@
    </dependencies>

    <properties>
-        <junit-jupiter.version>5.6.2</junit-jupiter.version>
        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
    </properties>

@@ -24,10 +24,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
    </dependencies>

 </project>
@@ -10,4 +10,4 @@ This module contains articles about bootstrapping Spring Boot applications.
 - [Deploy a Spring Boot Application to OpenShift](https://www.baeldung.com/spring-boot-deploy-openshift)
 - [Deploy a Spring Boot Application to AWS Beanstalk](https://www.baeldung.com/spring-boot-deploy-aws-beanstalk)
 - [Guide to @SpringBootConfiguration in Spring Boot](https://www.baeldung.com/springbootconfiguration-annotation)
- [Implement Health Checks in OpenShift](https://www.baeldung.com/openshift-health-checks)
+- [Implement Health Checks in OpenShift](https://www.baeldung.com/ops/openshift-health-checks)
@@ -34,4 +34,5 @@
            </plugin>
        </plugins>
    </build>
+
 </project>
@@ -6,3 +6,4 @@ This module contains articles about configuring the Spring Boot `Environment`
 - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor)
 - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
 - [Get the Running Port in Spring Boot](https://www.baeldung.com/spring-boot-running-port)
+ - [Environment Variable Prefixes in Spring Boot 2.5](https://www.baeldung.com/spring-boot-env-variable-prefixes)
@@ -4,8 +4,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-environment</artifactId>
-    <packaging>war</packaging>
    <name>spring-boot-environment</name>
+    <packaging>war</packaging>
    <description>Demo project for Spring Boot</description>

    <parent>
@@ -0,0 +1,14 @@
+package com.baeldung.prefix;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PrefixApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(PrefixApplication.class);
+        application.setEnvironmentPrefix("prefix");
+        application.run(args);
+    }
+}
@@ -0,0 +1,19 @@
+package com.baeldung.prefix;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PrefixController {
+
+    @Value(value = "${server.port}")
+    private int serverPort;
+
+    @GetMapping("/prefix")
+    public String getServerPortInfo(final Model model) {
+        model.addAttribute("serverPort", serverPort);
+        return "prefix";
+    }
+}
@@ -0,0 +1,9 @@
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+    <title>Prefix Example Page</title>
+</head>
+<body>
+It is working as we expected. Your server is running at port : <b th:text="${serverPort}"></b>
+</body>
+</html>
@@ -4,8 +4,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-exceptions</artifactId>
-    <packaging>jar</packaging>
    <name>spring-boot-exceptions</name>
+    <packaging>jar</packaging>
    <description>Demo project for working with Spring Boot exceptions</description>

    <parent>
@@ -4,8 +4,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-flowable</artifactId>
-    <packaging>war</packaging>
    <name>spring-boot-flowable</name>
+    <packaging>war</packaging>
    <description>Spring Boot Flowable Module</description>

    <parent>
@@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.example.jasypt</groupId>
    <artifactId>spring-boot-jasypt</artifactId>
-    <packaging>jar</packaging>
    <name>spring-boot-jasypt</name>
+    <packaging>jar</packaging>
    <description>Demo project for Spring Boot</description>

    <parent>
@@ -77,8 +77,6 @@

    <properties>
        <keycloak-adapter-bom.version>13.0.1</keycloak-adapter-bom.version>
-        <!-- explicit version declaration to be removed when parent-boot-2 is upgraded to 2.5.3 or above -->
-        <spring-boot.version>2.5.3</spring-boot.version>
    </properties>

 </project>
@@ -16,6 +16,25 @@
        <relativePath />
    </parent>

+    <dependencyManagement>
+        <dependencies>
+            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of junit:junit in the classpath. hence forcing the
+            latest 4.13.2 available version for junit5 compatibility -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -80,6 +99,9 @@
        <spring-boot-starter-log4j.version>1.3.8.RELEASE</spring-boot-starter-log4j.version>
        <gelfj.version>1.1.16</gelfj.version>
        <lombok.version>1.18.4</lombok.version>
+        <!-- used only in dependency management to force this version, not included as a direct dependency -->
+        <junit.version>4.13.2</junit.version>
+        <junit-jupiter.version>5.8.1</junit-jupiter.version>
    </properties>

 </project>
@@ -4,8 +4,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-mvc-2</artifactId>
-    <packaging>jar</packaging>
    <name>spring-boot-mvc-2</name>
+    <packaging>jar</packaging>
    <description>Module For Spring Boot MVC Web Fn</description>

    <parent>
@@ -1,3 +1,3 @@
 spring.mvc.static-path-pattern=/content/**
 spring.webflux.static-path-pattern=/content/**
-spring.resources.static-locations=classpath:/files/,classpath:/static-files
+spring.web.resources.static-locations=classpath:/files/,classpath:/static-files
@@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-mvc-birt</artifactId>
    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
    <name>spring-boot-mvc-birt</name>
+    <packaging>jar</packaging>
    <description>Module For Spring Boot Integration with BIRT</description>

    <!-- this module should use the Boot parent directly to avoid inherit the logback dependency from 
@@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-mvc-jersey</artifactId>
    <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
    <name>spring-boot-mvc-jersey</name>
+    <packaging>pom</packaging>

    <parent>
        <groupId>com.baeldung.spring-boot-modules</groupId>
@@ -4,8 +4,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-mvc</artifactId>
-    <packaging>jar</packaging>
    <name>spring-boot-mvc</name>
+    <packaging>jar</packaging>
    <description>Module For Spring Boot MVC</description>

    <parent>
@@ -6,8 +6,8 @@
    <groupId>com.baeldung.nashorn</groupId>
    <artifactId>spring-boot-nashorn</artifactId>
    <version>1.0</version>
-    <packaging>jar</packaging>
    <name>spring-boot-nashorn</name>
+    <packaging>jar</packaging>

    <parent>
        <groupId>com.baeldung.spring-boot-modules</groupId>
@@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-parent</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
    <name>spring-boot-parent</name>
+    <packaging>pom</packaging>
    <description>spring-boot-parent</description>

    <parent>
@@ -30,10 +30,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
    </dependencies>

    <properties>
@@ -3,8 +3,8 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <artifactId>spring-boot-performance</artifactId>
-    <packaging>war</packaging>
    <name>spring-boot-performance</name>
+    <packaging>war</packaging>
    <description>This is a simple Spring Boot application taking advantage of the latest Spring Boot improvements/features. Current version: 2.2</description>

    <parent>
@@ -6,13 +6,19 @@
    "@testing-library/jest-dom": "^5.11.10",
    "@testing-library/react": "^11.2.5",
    "@testing-library/user-event": "^12.8.3",
-    "bootstrap": "^4.1.3",
+    "@testing-library/dom": "^7.21.4",
+    "@types/webpack": "^5.28.0",
+    "sockjs-client": "^1.4.0",
+    "type-fest": "^0.13.1",
+    "webpack-hot-middleware": "^2.25.1",
+    "webpack-plugin-serve": "^1.5.0",
+    "bootstrap": "^5.1",
    "react": "^17.0.2",
-    "react-cookie": "^3.0.4",
+    "react-cookie": "^4.1.1",
    "react-dom": "^17.0.2",
-    "react-router-dom": "^4.3.1",
+    "react-router-dom": "^5.3.0",
    "react-scripts": "4.0.3",
-    "reactstrap": "^6.5.0",
+    "reactstrap": "^8.10.0",
    "web-vitals": "^1.1.1"
  },
  "scripts": {
@@ -125,7 +125,7 @@
        <maven.compiler.source>11</maven.compiler.source>
        <maven.compiler.target>11</maven.compiler.target>
        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
-        <node.version>v10.14.2</node.version>
+        <node.version>v14.18.0</node.version>
        <yarn.version>v1.12.1</yarn.version>
        <spring-boot.version>2.4.4</spring-boot.version>
        <h2.version>1.4.200</h2.version>
@@ -34,4 +34,4 @@
        </plugins>
    </build>

-</project>
+</project>