Merge pull request #6114 from rozagerardo/geroza/BAEL-9518_Upgrade-parent-spring-5-to-the-latest-version-2

[BAEL-9518] parent-spring-5 | Upgrade parent-spring-5 to the latest version of Spring 5 - part 2

ethereum/README.md

@@ -4,4 +4,3 @@
 - [Introduction to EthereumJ](http://www.baeldung.com/ethereumj)
 - [Creating and Deploying Smart Contracts with Solidity](http://www.baeldung.com/smart-contracts-ethereum-solidity)
 - [Lightweight Ethereum Clients Using Web3j](http://www.baeldung.com/web3j)
- 

ethereum/pom.xml

@@ -7,10 +7,10 @@
     <name>ethereum</name>
 
     <parent>
-        <artifactId>parent-spring-5-1</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5-1</relativePath>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
@@ -37,17 +37,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
 
         <!-- Ethereum -->
@@ -123,12 +123,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${springframework.version}</version>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -212,7 +212,6 @@
         <tomcat.version>8.5.4</tomcat.version>
         <ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
         <web3j.core.version>3.3.1</web3j.core.version>
-        <springframework.version>5.0.5.RELEASE</springframework.version>
         <spring.boot.version>1.5.6.RELEASE</spring.boot.version>
         <mockito.version>2.21.0</mockito.version>
         <jackson-databind.version>2.9.7</jackson-databind.version>

parent-spring-5-1/README.md

@@ -1 +0,0 @@
-## Relevant articles:

parent-spring-5-1/pom.xml

@@ -1,39 +0,0 @@
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>parent-spring-5-1</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>parent-spring-5-1</name>
-    <description>Parent for all spring 5 core modules</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring.version>5.0.6.RELEASE</spring.version>
-        <junit.jupiter.version>5.0.2</junit.jupiter.version>
-        <jackson-databind.version>2.9.6</jackson-databind.version>
-		<jackson.version>2.9.6</jackson.version>
-		<spring-security.version>5.0.6.RELEASE</spring-security.version>
-    </properties>
-
-</project>

persistence-modules/spring-data-elasticsearch/pom.xml

@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5-1</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5-1</relativePath>
+        <relativePath>../../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java

@@ -30,6 +30,13 @@ import org.junit.Test;
 
 import com.alibaba.fastjson.JSON;
 
+/**
+ * 
+ * This Manual test requires:
+ * * Elasticsearch instance running on host
+ * * with cluster name = elasticsearch
+ *
+ */
 public class ElasticSearchManualTest {
     private List<Person> listOfPersons = new ArrayList<>();
     private Client client = null;

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/GeoQueriesManualTest.java

@@ -31,9 +31,17 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baeldung.spring.data.es.config.Config;
 import com.vividsolutions.jts.geom.Coordinate;
 
+/**
+ * 
+ * This Manual test requires:
+ * * Elasticsearch instance running on host
+ * * with cluster name = elasticsearch
+ * * and further configurations
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = Config.class)
-public class GeoQueriesIntegrationTest {
+public class GeoQueriesManualTest {
 
     private static final String WONDERS_OF_WORLD = "wonders-of-world";
     private static final String WONDERS = "Wonders";

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/ElasticSearchManualTest.java

@@ -27,9 +27,16 @@ import com.baeldung.spring.data.es.model.Article;
 import com.baeldung.spring.data.es.model.Author;
 import com.baeldung.spring.data.es.service.ArticleService;
 
+/**
+ * 
+ * This Manual test requires:
+ * * Elasticsearch instance running on host
+ * * with cluster name = elasticsearch
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = Config.class)
-public class ElasticSearchIntegrationTest {
+public class ElasticSearchManualTest {
 
     @Autowired
     private ElasticsearchTemplate elasticsearchTemplate;

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/ElasticSearchQueryManualTest.java

@@ -41,9 +41,16 @@ import com.baeldung.spring.data.es.model.Article;
 import com.baeldung.spring.data.es.model.Author;
 import com.baeldung.spring.data.es.service.ArticleService;
 
+/**
+ * 
+ * This Manual test requires:
+ * * Elasticsearch instance running on host
+ * * with cluster name = elasticsearch
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = Config.class)
-public class ElasticSearchQueryIntegrationTest {
+public class ElasticSearchQueryManualTest {
 
     @Autowired
     private ElasticsearchTemplate elasticsearchTemplate;

persistence-modules/spring-data-elasticsearch/src/test/java/org/baeldung/SpringContextManualTest.java

@@ -7,9 +7,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baeldung.spring.data.es.config.Config;
 
+/**
+ * 
+ * This Manual test requires:
+ * * Elasticsearch instance running on host
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = Config.class)
-public class SpringContextIntegrationTest {
+public class SpringContextManualTest {
 
     @Test
     public void whenSpringContextIsBootstrapped_thenNoExceptions() {

persistence-modules/spring-data-mongodb/pom.xml

@@ -6,9 +6,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5-1</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5-1</relativePath>
+        <relativePath>../../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
@@ -96,7 +96,6 @@
     </build>
 
     <properties>
-        <spring.version>5.1.0.RELEASE</spring.version>
         <org.springframework.data.version>2.1.2.RELEASE</org.springframework.data.version>
         <querydsl.version>4.1.4</querydsl.version>
         <mysema.maven.version>1.1.3</mysema.maven.version>

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/aggregation/ZipsAggregationLiveTest.java

@@ -44,6 +44,12 @@ import com.mongodb.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class ZipsAggregationLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/gridfs/GridFSLiveTest.java

@@ -31,6 +31,12 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.client.gridfs.model.GridFSFile;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @ContextConfiguration("file:src/main/resources/mongoConfig.xml")
 @RunWith(SpringJUnit4ClassRunner.class)
 public class GridFSLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/DocumentQueryLiveTest.java

@@ -24,6 +24,12 @@ import com.baeldung.config.MongoConfig;
 import com.baeldung.model.EmailAddress;
 import com.baeldung.model.User;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class DocumentQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/MongoTemplateProjectionLiveTest.java

@@ -16,6 +16,12 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = SimpleMongoConfig.class)
 public class MongoTemplateProjectionLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/MongoTemplateQueryLiveTest.java

@@ -27,6 +27,12 @@ import com.baeldung.config.MongoConfig;
 import com.baeldung.model.EmailAddress;
 import com.baeldung.model.User;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class MongoTemplateQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/ActionRepositoryLiveTest.java

@@ -15,6 +15,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class ActionRepositoryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/BaseQueryLiveTest.java

@@ -7,6 +7,12 @@ import org.junit.Before;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 public class BaseQueryLiveTest {
 
     @Autowired

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/DSLQueryLiveTest.java

@@ -15,8 +15,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.querydsl.core.types.Predicate;
 
-
-
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class DSLQueryLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/JSONQueryLiveTest.java

@@ -12,6 +12,12 @@ import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class JSONQueryLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/QueryMethodsLiveTest.java

@@ -12,6 +12,12 @@ import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class QueryMethodsLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/UserRepositoryLiveTest.java

@@ -23,6 +23,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baeldung.config.MongoConfig;
 import com.baeldung.model.User;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class UserRepositoryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/UserRepositoryProjectionLiveTest.java

@@ -13,6 +13,12 @@ import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class UserRepositoryProjectionLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveLiveTest.java

@@ -12,6 +12,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baeldung.config.MongoReactiveConfig;
 import com.baeldung.model.User;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoReactiveConfig.class)
 public class MongoTransactionReactiveLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java

@@ -24,6 +24,12 @@ import org.springframework.transaction.support.TransactionTemplate;
 import com.baeldung.config.MongoConfig;
 import com.baeldung.model.User;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 public class MongoTransactionTemplateLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java

@@ -24,6 +24,12 @@ import com.baeldung.model.User;
 import com.baeldung.repository.UserRepository;
 import com.mongodb.MongoCommandException;
 
+/**
+ * 
+ * This test requires:
+ * * mongodb instance running on the environment
+ *
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = MongoConfig.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

pom.xml

@@ -330,7 +330,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
@@ -603,7 +602,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
@@ -997,7 +995,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                         
@@ -1049,7 +1046,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
@@ -1317,7 +1313,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 
@@ -1550,7 +1545,6 @@
                 <module>parent-boot-2</module>
                 <module>parent-spring-4</module>
                 <module>parent-spring-5</module>
-                <module>parent-spring-5-1</module>
                 <module>parent-java</module>
                 <module>parent-kotlin</module>
                 

spring-4/README.md

@@ -1,3 +1,4 @@
 ### Relevant Articles:
 - [A Guide to Flips for Spring](http://www.baeldung.com/flips-spring)
 - [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
+- [Spring JSON-P with Jackson](http://www.baeldung.com/spring-jackson-jsonp)

spring-4/pom.xml

@@ -52,6 +52,21 @@
             <!-- Check for the most recent available version: https://projectlombok.org/changelog.html -->
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <!-- Provided -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -71,6 +86,7 @@
     </build>
 
     <properties>
+        <start-class>com.baeldung.flips.ApplicationConfig</start-class>
         <flips-web.version>1.0.1</flips-web.version>
         <lombok.version>1.16.18</lombok.version>
         <h2database.version>1.4.197</h2database.version>

spring-4/src/main/java/com/baeldung/flips/ApplicationConfig.java

@@ -3,9 +3,15 @@ package com.baeldung.flips;
 import org.flips.describe.config.FlipWebContextConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+        DataSourceTransactionManagerAutoConfiguration.class,
+        HibernateJpaAutoConfiguration.class })
 @Import(FlipWebContextConfiguration.class)
 public class ApplicationConfig {