Skip to content
This repository was archived by the owner on May 6, 2025. It is now read-only.

Commit bc83d86

Browse files
committed
uplifted versions:
java8 spring-boot 1.4.1.RELEASE spring-cloud Camden.SR1 removed JVM argument obselete in Java8
1 parent 595dd3b commit bc83d86

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

foundation/pom.xml

+13-7
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1818

1919
<!-- java related -->
20-
<java.version>1.7</java.version>
20+
<java.version>1.8</java.version>
2121
<jacoco.version>0.7.5.201505241946</jacoco.version>
2222

2323
<!-- Spring dependencies -->
24-
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
25-
<spring.cloud.parent.version>Brixton.M2</spring.cloud.parent.version>
24+
<spring.boot.version>1.4.1.RELEASE</spring.boot.version>
25+
<spring.cloud.parent.version>Camden.SR1</spring.cloud.parent.version>
2626

2727
<!-- CXF -->
2828
<cxf.version>3.1.4</cxf.version>
@@ -36,10 +36,10 @@
3636

3737
<!-- test related dependencies -->
3838
<rest.assured.version>2.4.1</rest.assured.version>
39-
<flyway.version>3.2.1</flyway.version>
39+
<flyway.version>4.0.1</flyway.version>
4040

4141
<!-- utilites libraries -->
42-
<guava.version>19.0-rc2</guava.version>
42+
<guava.version>19.0</guava.version>
4343

4444
<!-- build related -->
4545
<docver.maven.plugin.version>0.3.6</docver.maven.plugin.version>
@@ -63,7 +63,7 @@
6363
<modules>
6464
<module>domain</module>
6565
<module>service-support</module>
66-
<module>test-webapp</module>
66+
<module>test-webapp</module>
6767
</modules>
6868

6969
<dependencyManagement>
@@ -150,6 +150,12 @@
150150
<groupId>org.flywaydb.flyway-test-extensions</groupId>
151151
<artifactId>flyway-spring-test</artifactId>
152152
<version>${flyway.version}</version>
153+
<exclusions>
154+
<exclusion>
155+
<groupId>org.slf4j</groupId>
156+
<artifactId>slf4j-simple</artifactId>
157+
</exclusion>
158+
</exclusions>
153159
</dependency>
154160

155161
</dependencies>
@@ -229,7 +235,7 @@
229235
<version>2.17</version>
230236
<configuration>
231237
<forkCount>1</forkCount>
232-
<argLine>-Xmx1024m -XX:PermSize=96m -XX:MaxPermSize=192m -Djava.security.egd=file:/dev/./urandom</argLine>
238+
<argLine>-Xmx1024m -Djava.security.egd=file:/dev/./urandom</argLine>
233239
<includes>
234240
<include>**/*Test*.java</include>
235241
<include>**/*Test*.groovy</include>

ibank/apps/pom.xml

-3
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@
188188
<plugin>
189189
<groupId>org.springframework.boot</groupId>
190190
<artifactId>spring-boot-maven-plugin</artifactId>
191-
<configuration>
192-
<jvmArguments>-XX:PermSize=96m -XX:MaxPermSize=256m</jvmArguments>
193-
</configuration>
194191
</plugin>
195192
<plugin>
196193
<groupId>org.apache.maven.plugins</groupId>

infra/auth-server/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<properties>
1818
<docker.image.name>${docker.registry.prefix}/infra-auth-server</docker.image.name>
19-
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
19+
<spring.boot.version>1.4.1.RELEASE</spring.boot.version>
2020
</properties>
2121

2222
<dependencyManagement>
@@ -168,7 +168,7 @@
168168
<version>2.17</version>
169169
<configuration>
170170
<forkCount>1</forkCount>
171-
<argLine>-Xmx1024m -XX:PermSize=96m -XX:MaxPermSize=192m -Djava.security.egd=file:/dev/./urandom</argLine>
171+
<argLine>-Xmx1024m -Djava.security.egd=file:/dev/./urandom</argLine>
172172
<includes>
173173
<include>**/*Test*.java</include>
174174
<include>**/*Test*.groovy</include>

infra/cloud-server/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
<properties>
1818
<docker.image.name>${docker.registry.prefix}/infra-cloud-server</docker.image.name>
19-
<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
20-
<spring.cloud.parent.version>Brixton.M3</spring.cloud.parent.version>
19+
<spring.boot.version>1.4.1.RELEASE</spring.boot.version>
20+
<spring.cloud.parent.version>Camden.SR1</spring.cloud.parent.version>
2121
</properties>
2222

2323
<dependencyManagement>
@@ -111,7 +111,7 @@
111111
<version>2.17</version>
112112
<configuration>
113113
<forkCount>1</forkCount>
114-
<argLine>-Xmx1024m -XX:PermSize=96m -XX:MaxPermSize=192m -Djava.security.egd=file:/dev/./urandom</argLine>
114+
<argLine>-Xmx1024m -Djava.security.egd=file:/dev/./urandom</argLine>
115115
<includes>
116116
<include>**/*Test*.java</include>
117117
<include>**/*Test*.groovy</include>

infra/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- maven settings -->
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<java.version>1.7</java.version>
18+
<java.version>1.8</java.version>
1919

2020
<docker.registry.prefix>sloppycoder</docker.registry.prefix>
2121
<!--

0 commit comments

Comments
 (0)