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

BAEL-1238 (#2974) 

* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* update

* michael.good703@gmail.com

Had to add @SpringBootApplication(exclude = MySQLAutoconfiguration.class)

* Updated for 3.3.0.Final

BAEL-1238

* Update pom.xml

* BAEL-1238

Added new module spring-boot-keycloak and removed Keycloak code from spring-boot module

* Minor changes to pom.xml

* Update CustomConverterTest.java

* Update StringToEmployeeConverter.java

* Update GenericBigDecimalConverter.java

* Update MyFeatures.java

* Update .gitignore

* Formatting changes

* "Resolving conflicts"

* Updated spring-boot to remove keycloak

* Updated to see

* Update

* Updated

* Found remnant file and deleted it

* Update pom.xml

Added spring-boot-keycloak module

* Added reference to parent-boot-5

I changed the parent from org.springframework.boot to parent-boot-5.

* Update GenericBigDecimalConverter.java

Copy current GenericBigDecimalConverter to resolve any conflicts

* Update StringToEmployeeConverter.java

Copy current version to resolve any conflicts

* Update pom.xml

* Update pom.xml

* Delete remnant files

* Updated pom.xml

* Update pom.xml
This commit is contained in:
Michael C Good 2017-11-06 17:44:53 -05:00 committed by maibin
parent 50daef5bdc
commit bc3d33151c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -149,6 +149,7 @@
<module>spring-batch</module> <module>spring-batch</module>
<module>spring-bom</module> <module>spring-bom</module>
<module>spring-boot</module> <module>spring-boot</module>
<module>spring-boot-keycloak</module>
<module>spring-boot-bootstrap</module> <module>spring-boot-bootstrap</module>
<module>spring-cloud-data-flow</module> <module>spring-cloud-data-flow</module>
<module>spring-cloud</module> <module>spring-cloud</module>

10
spring-boot-keycloak/pom.xml
View File

@ -12,10 +12,12 @@
<description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description> <description>This is a simple application demonstrating integration between Keycloak and Spring Boot.</description>
<parent> <parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <groupId>com.baeldung</groupId>
<version>1.5.8.RELEASE</version> <artifactId>parent-boot-4</artifactId>
<relativePath /> <!-- lookup parent from repository --> <version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-4</relativePath>
</parent> </parent>
<properties> <properties>