Skip to content

Commit 9e5faf2

Browse files
author
eugenp
committed
upgrade and eclipse work
1 parent 350330b commit 9e5faf2

File tree

99 files changed

+703
-702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+703
-702
lines changed

‎core-java-8/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@
9393

9494
<properties>
9595
<!-- logging -->
96-
<org.slf4j.version>1.7.5</org.slf4j.version>
97-
<logback.version>1.0.11</logback.version>
96+
<org.slf4j.version>1.7.12</org.slf4j.version>
97+
<logback.version>1.0.13</logback.version>
9898

9999
<!-- various -->
100100
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
101101

102102
<!-- util -->
103103
<guava.version>18.0</guava.version>
104-
<commons-lang3.version>3.3.2</commons-lang3.version>
104+
<commons-lang3.version>3.4</commons-lang3.version>
105105

106106
<!-- testing -->
107107
<org.hamcrest.version>1.3</org.hamcrest.version>
108108
<junit.version>4.12</junit.version>
109109
<mockito.version>1.10.19</mockito.version>
110110

111111
<!-- maven plugins -->
112-
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
112+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
113113
<maven-war-plugin.version>2.6</maven-war-plugin.version>
114114
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
115115
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>

‎core-java/.classpath‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
<attribute name="maven.pomderived" value="true"/>
2222
</attributes>
2323
</classpathentry>
24-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
24+
<classpathentry kind="src" output="target/classes" path="src/main/java">
2525
<attributes>
26+
<attribute name="optional" value="true"/>
2627
<attribute name="maven.pomderived" value="true"/>
2728
</attributes>
2829
</classpathentry>
29-
<classpathentry kind="src" output="target/classes" path="src/main/java">
30+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3031
<attributes>
31-
<attribute name="optional" value="true"/>
3232
<attribute name="maven.pomderived" value="true"/>
3333
</attributes>
3434
</classpathentry>

‎core-java/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
66
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
77
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
88
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
9-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
9+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
1010
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
11-
org.eclipse.jdt.core.compiler.compliance=1.7
11+
org.eclipse.jdt.core.compiler.compliance=1.8
1212
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1313
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1414
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9696
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
9797
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9898
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99-
org.eclipse.jdt.core.compiler.source=1.7
99+
org.eclipse.jdt.core.compiler.source=1.8

‎core-java/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@
123123
<artifactId>maven-compiler-plugin</artifactId>
124124
<version>${maven-compiler-plugin.version}</version>
125125
<configuration>
126-
<source>1.7</source>
127-
<target>1.7</target>
126+
<source>1.8</source>
127+
<target>1.8</target>
128128
</configuration>
129129
</plugin>
130130

@@ -149,39 +149,39 @@
149149
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
150150

151151
<!-- persistence -->
152-
<hibernate.version>4.3.8.Final</hibernate.version>
153-
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
152+
<hibernate.version>4.3.10.Final</hibernate.version>
153+
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
154154

155155
<!-- marshalling -->
156156
<jackson.version>2.4.4</jackson.version>
157157

158158
<!-- logging -->
159-
<org.slf4j.version>1.7.9</org.slf4j.version>
160-
<logback.version>1.1.2</logback.version>
159+
<org.slf4j.version>1.7.12</org.slf4j.version>
160+
<logback.version>1.1.3</logback.version>
161161

162162
<!-- various -->
163163
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
164164

165165
<!-- util -->
166-
<guava.version>17.0</guava.version> <!-- upgrade to 18.0 -->
167-
<commons-lang3.version>3.3.2</commons-lang3.version>
166+
<guava.version>18.0</guava.version>
167+
<commons-lang3.version>3.4</commons-lang3.version>
168168

169169
<!-- testing -->
170170
<org.hamcrest.version>1.3</org.hamcrest.version>
171171
<junit.version>4.11</junit.version>
172172
<mockito.version>1.10.19</mockito.version>
173173

174-
<httpcore.version>4.4</httpcore.version>
175-
<httpclient.version>4.4</httpclient.version>
174+
<httpcore.version>4.4.1</httpcore.version>
175+
<httpclient.version>4.5</httpclient.version>
176176

177-
<rest-assured.version>2.4.0</rest-assured.version>
177+
<rest-assured.version>2.4.1</rest-assured.version>
178178

179179
<!-- maven plugins -->
180-
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
180+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
181181
<maven-war-plugin.version>2.6</maven-war-plugin.version>
182182
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
183183
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
184-
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
184+
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
185185

186186
</properties>
187187

‎gson/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
30+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
3333
</attributes>

‎gson/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<artifactId>maven-compiler-plugin</artifactId>
9898
<version>${maven-compiler-plugin.version}</version>
9999
<configuration>
100-
<source>1.7</source>
101-
<target>1.7</target>
100+
<source>1.8</source>
101+
<target>1.8</target>
102102
</configuration>
103103
</plugin>
104104

@@ -118,39 +118,39 @@
118118
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
119119

120120
<!-- persistence -->
121-
<hibernate.version>4.3.8.Final</hibernate.version>
122-
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
121+
<hibernate.version>4.3.10.Final</hibernate.version>
122+
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
123123

124124
<!-- marshalling -->
125125
<gson.version>2.3</gson.version>
126126

127127
<!-- logging -->
128-
<org.slf4j.version>1.7.9</org.slf4j.version>
129-
<logback.version>1.1.2</logback.version>
128+
<org.slf4j.version>1.7.12</org.slf4j.version>
129+
<logback.version>1.1.3</logback.version>
130130

131131
<!-- various -->
132132
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
133133

134134
<!-- util -->
135135
<guava.version>18.0</guava.version>
136-
<commons-lang3.version>3.3.2</commons-lang3.version>
136+
<commons-lang3.version>3.4</commons-lang3.version>
137137

138138
<!-- testing -->
139139
<org.hamcrest.version>1.3</org.hamcrest.version>
140140
<junit.version>4.11</junit.version>
141141
<mockito.version>1.10.19</mockito.version>
142142

143-
<httpcore.version>4.4</httpcore.version>
144-
<httpclient.version>4.4</httpclient.version>
143+
<httpcore.version>4.4.1</httpcore.version>
144+
<httpclient.version>4.5</httpclient.version>
145145

146-
<rest-assured.version>2.4.0</rest-assured.version>
146+
<rest-assured.version>2.4.1</rest-assured.version>
147147

148148
<!-- maven plugins -->
149-
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
149+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
150150
<maven-war-plugin.version>2.6</maven-war-plugin.version>
151151
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
152152
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
153-
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
153+
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
154154

155155
</properties>
156156

‎guava/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
30+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
3333
</attributes>

‎guava/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
55
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
66
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
77
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
8-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
8+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
99
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
10-
org.eclipse.jdt.core.compiler.compliance=1.7
10+
org.eclipse.jdt.core.compiler.compliance=1.8
1111
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1212
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1313
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
9292
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9393
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9494
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
95-
org.eclipse.jdt.core.compiler.source=1.7
95+
org.eclipse.jdt.core.compiler.source=1.8

‎guava/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
<artifactId>maven-compiler-plugin</artifactId>
7878
<version>${maven-compiler-plugin.version}</version>
7979
<configuration>
80-
<source>1.7</source>
81-
<target>1.7</target>
80+
<source>1.8</source>
81+
<target>1.8</target>
8282
</configuration>
8383
</plugin>
8484

@@ -98,36 +98,36 @@
9898
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
9999

100100
<!-- persistence -->
101-
<hibernate.version>4.3.8.Final</hibernate.version>
102-
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
101+
<hibernate.version>4.3.10.Final</hibernate.version>
102+
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
103103

104104
<!-- logging -->
105-
<org.slf4j.version>1.7.9</org.slf4j.version>
106-
<logback.version>1.1.2</logback.version>
105+
<org.slf4j.version>1.7.12</org.slf4j.version>
106+
<logback.version>1.1.3</logback.version>
107107

108108
<!-- various -->
109109
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
110110

111111
<!-- util -->
112112
<guava.version>18.0</guava.version>
113-
<commons-lang3.version>3.3.2</commons-lang3.version>
113+
<commons-lang3.version>3.4</commons-lang3.version>
114114

115115
<!-- testing -->
116116
<org.hamcrest.version>1.3</org.hamcrest.version>
117117
<junit.version>4.11</junit.version>
118118
<mockito.version>1.10.19</mockito.version>
119119

120-
<httpcore.version>4.4</httpcore.version>
121-
<httpclient.version>4.4</httpclient.version>
120+
<httpcore.version>4.4.1</httpcore.version>
121+
<httpclient.version>4.5</httpclient.version>
122122

123-
<rest-assured.version>2.4.0</rest-assured.version>
123+
<rest-assured.version>2.4.1</rest-assured.version>
124124

125125
<!-- maven plugins -->
126-
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
126+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
127127
<maven-war-plugin.version>2.6</maven-war-plugin.version>
128128
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
129129
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
130-
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
130+
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
131131

132132
</properties>
133133

‎handling-spring-static-resources/pom.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,40 +184,40 @@
184184
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
185185

186186
<!-- persistence -->
187-
<hibernate.version>4.3.8.Final</hibernate.version>
188-
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
189-
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
187+
<hibernate.version>4.3.10.Final</hibernate.version>
188+
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
189+
<spring-data-jpa.version>1.7.2.RELEASE</spring-data-jpa.version>
190190

191191
<!-- marshalling -->
192192

193193
<jackson.version>2.4.4</jackson.version>
194194

195195
<!-- logging -->
196-
<org.slf4j.version>1.7.9</org.slf4j.version>
197-
<logback.version>1.1.2</logback.version>
196+
<org.slf4j.version>1.7.12</org.slf4j.version>
197+
<logback.version>1.1.3</logback.version>
198198

199199
<!-- various -->
200200
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
201201

202202
<!-- util -->
203203
<guava.version>18.0</guava.version>
204-
<commons-lang3.version>3.3.2</commons-lang3.version>
204+
<commons-lang3.version>3.4</commons-lang3.version>
205205

206206
<!-- testing -->
207207
<org.hamcrest.version>1.3</org.hamcrest.version>
208208
<junit.version>4.11</junit.version>
209209
<mockito.version>1.10.19</mockito.version>
210210

211-
<httpcore.version>4.4</httpcore.version>
212-
<httpclient.version>4.4</httpclient.version>
211+
<httpcore.version>4.4.1</httpcore.version>
212+
<httpclient.version>4.5</httpclient.version>
213213

214-
<rest-assured.version>2.4.0</rest-assured.version>
214+
<rest-assured.version>2.4.1</rest-assured.version>
215215

216216
<!-- Maven plugins -->
217-
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
217+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
218218
<maven-war-plugin.version>2.6</maven-war-plugin.version>
219219
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
220-
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
220+
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
221221
</properties>
222222

223223
</project>

0 commit comments

Comments
 (0)