1ab0a19d25
* Java 3590 (#11367) * JAVA-3590: updating junit-jupiter dependency in the main pom.xml * resolving unnecessary mockito stubbings exception * adding junit-bom in dependency management * fixing tests which were not getting discovered * Revert "fixing tests which were not getting discovered" This reverts commit 2e9ed8df42eb96f7e0929167aabbc2ddd374a263. * fixing tests in ninja, open-liberty and spring-ejb * removing junit4 dependency and replacing it with junit-vintage-engine * removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda * removing junit dependency and replacing it with junit-vintage-engine * removing junit and replacing it with junit-vintage-engine * fixing tests that were not getting discovered due to old version of junit:junit * updated failsafe plugin configuration to skip integration tests in blade * fixing tests that were not getting discovered due to old version of junit:junit * fixing tests in libraries and libraries-2 modules Co-authored-by: chaos2418 <> * Java 3590 - fixing integration tests in restx and spring-5-webflux (#11382) * JAVA-3590: updating junit-jupiter dependency in the main pom.xml * resolving unnecessary mockito stubbings exception * adding junit-bom in dependency management * fixing tests which were not getting discovered * Revert "fixing tests which were not getting discovered" This reverts commit 2e9ed8df42eb96f7e0929167aabbc2ddd374a263. * fixing tests in ninja, open-liberty and spring-ejb * removing junit4 dependency and replacing it with junit-vintage-engine * removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda * removing junit dependency and replacing it with junit-vintage-engine * removing junit and replacing it with junit-vintage-engine * fixing tests that were not getting discovered due to old version of junit:junit * updated failsafe plugin configuration to skip integration tests in blade * fixing tests that were not getting discovered due to old version of junit:junit * fixing tests in libraries and libraries-2 modules * fixing integration tests in restx and spring-5-webflux Co-authored-by: chaos2418 <> Co-authored-by: chaos2418 <92030908+chaos2418@users.noreply.github.com>
317 lines
12 KiB
XML
317 lines
12 KiB
XML
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<artifactId>spring-rest-simple</artifactId>
|
|
<version>0.1-SNAPSHOT</version>
|
|
<name>spring-rest-simple</name>
|
|
<packaging>war</packaging>
|
|
|
|
<parent>
|
|
<groupId>com.baeldung</groupId>
|
|
<artifactId>parent-boot-2</artifactId>
|
|
<version>0.0.1-SNAPSHOT</version>
|
|
<relativePath>../../parent-boot-2</relativePath>
|
|
</parent>
|
|
|
|
<dependencies>
|
|
<!-- Spring Boot Dependencies -->
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-devtools</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework.boot</groupId>
|
|
<artifactId>spring-boot-starter-web</artifactId>
|
|
</dependency>
|
|
<!-- Spring -->
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-web</artifactId>
|
|
<exclusions>
|
|
<exclusion>
|
|
<artifactId>commons-logging</artifactId>
|
|
<groupId>commons-logging</groupId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-webmvc</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-oxm</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>commons-fileupload</groupId>
|
|
<artifactId>commons-fileupload</artifactId>
|
|
<version>${commons-fileupload.version}</version>
|
|
</dependency>
|
|
<!-- web -->
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<scope>provided</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>jstl</artifactId>
|
|
<scope>runtime</scope>
|
|
</dependency>
|
|
<!-- marshalling -->
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
<artifactId>jackson-databind</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
|
<artifactId>jackson-dataformat-xml</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.thoughtworks.xstream</groupId>
|
|
<artifactId>xstream</artifactId>
|
|
<version>${xstream.version}</version>
|
|
</dependency>
|
|
<!-- util -->
|
|
<dependency>
|
|
<groupId>com.google.guava</groupId>
|
|
<artifactId>guava</artifactId>
|
|
<version>${guava.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.commons</groupId>
|
|
<artifactId>commons-lang3</artifactId>
|
|
<version>${commons-lang3.version}</version>
|
|
</dependency>
|
|
<!-- logging -->
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-api</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ch.qos.logback</groupId>
|
|
<artifactId>logback-classic</artifactId>
|
|
<!-- <scope>runtime</scope> -->
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>jcl-over-slf4j</artifactId>
|
|
<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
|
|
</dependency>
|
|
<!-- okhttp -->
|
|
<dependency>
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
<artifactId>okhttp</artifactId>
|
|
<version>${com.squareup.okhttp3.version}</version>
|
|
</dependency>
|
|
<!-- test scoped -->
|
|
<dependency>
|
|
<groupId>org.junit.vintage</groupId>
|
|
<artifactId>junit-vintage-engine</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.hamcrest</groupId>
|
|
<artifactId>hamcrest</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.mockito</groupId>
|
|
<artifactId>mockito-core</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.springframework</groupId>
|
|
<artifactId>spring-test</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.jayway.restassured</groupId>
|
|
<artifactId>rest-assured</artifactId>
|
|
<version>${jayway-rest-assured.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.google.protobuf</groupId>
|
|
<artifactId>protobuf-java</artifactId>
|
|
<version>${protobuf-java.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.googlecode.protobuf-java-format</groupId>
|
|
<artifactId>protobuf-java-format</artifactId>
|
|
<version>${protobuf-java-format.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.esotericsoftware</groupId>
|
|
<artifactId>kryo</artifactId>
|
|
<version>${kryo.version}</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.jayway.jsonpath</groupId>
|
|
<artifactId>json-path</artifactId>
|
|
</dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
<finalName>spring-rest-simple</finalName>
|
|
<resources>
|
|
<resource>
|
|
<directory>src/main/resources</directory>
|
|
<filtering>true</filtering>
|
|
</resource>
|
|
</resources>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.cargo</groupId>
|
|
<artifactId>cargo-maven2-plugin</artifactId>
|
|
<version>${cargo-maven2-plugin.version}</version>
|
|
<configuration>
|
|
<!--<wait>true</wait> caused errors on commit -->
|
|
<container>
|
|
<containerId>tomcat8x</containerId>
|
|
<type>embedded</type>
|
|
<systemProperties>
|
|
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
|
|
</systemProperties>
|
|
</container>
|
|
<configuration>
|
|
<properties>
|
|
<cargo.servlet.port>8082</cargo.servlet.port>
|
|
</properties>
|
|
</configuration>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
<profiles>
|
|
<profile>
|
|
<id>integration</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.cargo</groupId>
|
|
<artifactId>cargo-maven2-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>start-server</id>
|
|
<phase>pre-integration-test</phase>
|
|
<goals>
|
|
<goal>start</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>stop-server</id>
|
|
<phase>post-integration-test</phase>
|
|
<goals>
|
|
<goal>stop</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<phase>integration-test</phase>
|
|
<goals>
|
|
<goal>test</goal>
|
|
</goals>
|
|
<configuration>
|
|
<excludes>
|
|
<exclude>none</exclude>
|
|
</excludes>
|
|
<includes>
|
|
<include>**/*IntegrationTest.java</include>
|
|
<include>**/*IntTest.java</include>
|
|
</includes>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
<profile>
|
|
<id>live</id>
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.codehaus.cargo</groupId>
|
|
<artifactId>cargo-maven2-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<id>start-server</id>
|
|
<phase>pre-integration-test</phase>
|
|
<goals>
|
|
<goal>start</goal>
|
|
</goals>
|
|
</execution>
|
|
<execution>
|
|
<id>stop-server</id>
|
|
<phase>post-integration-test</phase>
|
|
<goals>
|
|
<goal>stop</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
<executions>
|
|
<execution>
|
|
<phase>integration-test</phase>
|
|
<goals>
|
|
<goal>test</goal>
|
|
</goals>
|
|
<configuration>
|
|
<excludes>
|
|
<exclude>none</exclude>
|
|
</excludes>
|
|
<includes>
|
|
<include>**/*LiveTest.java</include>
|
|
</includes>
|
|
<systemPropertyVariables>
|
|
<webTarget>cargo</webTarget>
|
|
</systemPropertyVariables>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
</profiles>
|
|
|
|
<properties>
|
|
<kryo.version>4.0.0</kryo.version>
|
|
<protobuf-java-format.version>1.4</protobuf-java-format.version>
|
|
<protobuf-java.version>3.1.0</protobuf-java.version>
|
|
<xstream.version>1.4.9</xstream.version>
|
|
<!-- util -->
|
|
<guava.version>20.0</guava.version>
|
|
<jayway-rest-assured.version>2.9.0</jayway-rest-assured.version>
|
|
<!-- Maven plugins -->
|
|
<cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
|
|
<findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
|
|
<!-- okhttp -->
|
|
<com.squareup.okhttp3.version>3.4.1</com.squareup.okhttp3.version>
|
|
<json.path.version>2.2.0</json.path.version>
|
|
</properties>
|
|
|
|
</project> |