iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5288 from dkapil/task/BAEL-8961 

BAEL-8961 Fix surefire configs of spring-4, jasyptdemo, spring-boot l…
This commit is contained in:
Loredana Crusoveanu 2018-09-19 07:22:15 +03:00 committed by GitHub
parent 505c5ae95d c67e8e817c
commit ca1f5f6bfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptTest.java → spring-boot-jasypt/src/test/java/com/baeldung/jasypt/CustomJasyptIntegrationTest.java
View File

@ -14,7 +14,7 @@ import com.baeldung.jasypt.Main;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {Main.class})
public class CustomJasyptTest {
public class CustomJasyptIntegrationTest {
@Autowired
ApplicationContext appCtx;

2
spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleTest.java → spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptSimpleIntegrationTest.java
View File

@ -13,7 +13,7 @@ import com.baeldung.jasypt.simple.PropertyServiceForJasyptSimple;
@RunWith(SpringRunner.class)
@SpringBootTest
public class JasyptSimpleTest {
public class JasyptSimpleIntegrationTest {
@Autowired
ApplicationContext appCtx;

2
spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterTest.java → spring-boot-jasypt/src/test/java/com/baeldung/jasypt/JasyptWithStarterIntegrationTest.java
View File

@ -14,7 +14,7 @@ import com.baeldung.jasypt.starter.PropertyServiceForJasyptStarter;
@RunWith(SpringRunner.class)
@SpringBootTest
public class JasyptWithStarterTest {
public class JasyptWithStarterIntegrationTest {
@Autowired
ApplicationContext appCtx;

1
spring-cloud/pom.xml
View File

@ -35,6 +35,7 @@
<module>spring-cloud-archaius</module>
<module>spring-cloud-functions</module>
<module>spring-cloud-vault</module>
<module>spring-cloud-security</module>
</modules>
<build>

29
spring-cloud/spring-cloud-security/README.md
View File

@ -1,29 +0,0 @@
# README #
This README would normally document whatever steps are necessary to get your application up and running.
### What is this repository for? ###
* Quick summary
* Version
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
### How do I get set up? ###
* Summary of set up
* Configuration
* Dependencies
* Database configuration
* How to run tests
* Deployment instructions
### Contribution guidelines ###
* Writing tests
* Code review
* Other guidelines
### Who do I talk to? ###
* Repo owner or admin
* Other community or team contact

14
spring-cloud/spring-cloud-security/auth-client/pom.xml
View File

@ -2,18 +2,15 @@
<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>auth-client</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>auth-client</name>
<description>Demo project for Spring Boot</description>
<description>Spring Cloud Security APP Client Module</description>
<parent>
<artifactId>parent-boot-1</artifactId>
<artifactId>spring-cloud-security</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-1</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
@ -88,9 +85,6 @@
</dependencyManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<js-cookie.version>2.1.0</js-cookie.version>
<spring-cloud.version>Dalston.SR4</spring-cloud.version>
</properties>

2
spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationTests.java → spring-cloud/spring-cloud-security/auth-client/src/test/java/com/example/springoath2/Springoath2ApplicationIntegrationTest.java
View File

@ -9,7 +9,7 @@ import com.baeldung.CloudSite;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = CloudSite.class)
public class Springoath2ApplicationTests {
public class Springoath2ApplicationIntegrationTest {
@Test
public void contextLoads() {

14
spring-cloud/spring-cloud-security/auth-resource/pom.xml
View File

@ -3,21 +3,18 @@
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>auth-resource</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>auth-resource</name>
<description>Demo project for Spring Boot</description>
<description>Spring Cloud Security APP Resource Module</description>
<parent>
<artifactId>parent-boot-1</artifactId>
<artifactId>spring-cloud-security</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-1</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
@ -60,9 +57,6 @@
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>Edgware.RELEASE</spring-cloud.version>
</properties>

2
spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationTests.java → spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java
View File

@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class PersonserviceApplicationTests {
public class PersonserviceApplicationIntegrationTest {
@Test
public void contextLoads() {

10
spring-cloud/spring-cloud-security/auth-server/pom.xml
View File

@ -2,15 +2,13 @@
<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>auth-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<description>Spring Cloud Security APP Server Module</description>
<parent>
<artifactId>parent-boot-1</artifactId>
<artifactId>spring-cloud-security</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../../parent-boot-1</relativePath>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>

23
spring-cloud/spring-cloud-security/pom.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
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-cloud-security</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>spring-cloud-security</name>
<parent>
<artifactId>parent-boot-1</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../../parent-boot-1</relativePath>
</parent>
<modules>
<module>auth-client</module>
<module>auth-resource</module>
<module>auth-server</module>
</modules>
</project>