Skip to content

Commit c4f3a1d

Browse files
author
eugenp
committed
eclipse overall work
1 parent 641f281 commit c4f3a1d

File tree

10 files changed

+69
-25
lines changed

10 files changed

+69
-25
lines changed

‎core-java/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
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.8">
30+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
3131
<attributes>
32-
<attribute name="maven.pomderived" value="true"/>
32+
<attribute name="owner.project.facets" value="java"/>
3333
</attributes>
3434
</classpathentry>
3535
<classpathentry kind="output" path="target/classes"/>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ 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.8
10-
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
11-
org.eclipse.jdt.core.compiler.compliance=1.8
12-
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
13-
org.eclipse.jdt.core.compiler.debug.localVariable=generate
14-
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
10+
org.eclipse.jdt.core.compiler.compliance=1.7
1511
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
1612
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1713
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -96,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9692
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
9793
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9894
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99-
org.eclipse.jdt.core.compiler.source=1.8
95+
org.eclipse.jdt.core.compiler.source=1.7

‎core-java/.settings/org.eclipse.wst.common.project.facet.core.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
3-
<installed facet="java" version="1.8"/>
3+
<installed facet="java" version="1.7"/>
44
</faceted-project>

‎core-java/pom.xml‎

Lines changed: 2 additions & 2 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.8</source>
127-
<target>1.8</target>
126+
<source>1.7</source>
127+
<target>1.7</target>
128128
</configuration>
129129
</plugin>
130130

‎spring-boot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>1.2.3.RELEASE</version>
15+
<version>1.2.4.RELEASE</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-rest/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</classpathentry>
3131
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
3232
<attributes>
33-
<attribute name="owner.project.facets" value="java"/>
33+
<attribute name="maven.pomderived" value="true"/>
3434
</attributes>
3535
</classpathentry>
3636
<classpathentry kind="output" path="target/classes"/>

‎spring-rest/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>1.2.2.RELEASE</version>
13+
<version>1.2.4.RELEASE</version>
1414
</parent>
1515

1616
<dependencies>

‎spring-security-login-and-registration/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2424
</attributes>
2525
</classpathentry>
26-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
26+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
2727
<attributes>
2828
<attribute name="owner.project.facets" value="java"/>
2929
</attributes>

‎spring-security-login-and-registration/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>1.1.12.RELEASE</version>
13+
<version>1.2.4.RELEASE</version>
1414
</parent>
1515

1616
<dependencies>

‎spring-security-mvc-ldap/pom.xml‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>1.2.2.RELEASE</version>
14+
<version>1.2.4.RELEASE</version>
1515
</parent>
1616

1717
<dependencies>
@@ -26,26 +26,25 @@
2626
<artifactId>spring-boot-starter-thymeleaf</artifactId>
2727
</dependency>
2828
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-actuator</artifactId>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-starter-actuator</artifactId>
3131
</dependency>
32-
32+
3333
<!-- LDAP Dependencies -->
3434
<dependency>
3535
<groupId>org.springframework.security</groupId>
3636
<artifactId>spring-security-ldap</artifactId>
37-
<version>3.2.4.RELEASE</version>
3837
</dependency>
3938

4039
<dependency>
4140
<groupId>org.springframework.ldap</groupId>
4241
<artifactId>spring-ldap-core</artifactId>
43-
<version>2.0.2.RELEASE</version>
42+
<version>2.0.3.RELEASE</version>
4443
</dependency>
4544
<dependency>
4645
<groupId>org.springframework.ldap</groupId>
4746
<artifactId>spring-ldap-core-tiger</artifactId>
48-
<version>2.0.2.RELEASE</version>
47+
<version>2.0.3.RELEASE</version>
4948
</dependency>
5049

5150
<dependency>
@@ -57,7 +56,7 @@
5756
<dependency>
5857
<groupId>org.apache.mina</groupId>
5958
<artifactId>mina-core</artifactId>
60-
<version>2.0.7</version>
59+
<version>2.0.9</version>
6160
</dependency>
6261

6362
</dependencies>
@@ -70,9 +69,58 @@
7069
<filtering>true</filtering>
7170
</resource>
7271
</resources>
72+
73+
<plugins>
74+
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-compiler-plugin</artifactId>
78+
<version>${maven-compiler-plugin.version}</version>
79+
<configuration>
80+
<source>1.8</source>
81+
<target>1.8</target>
82+
</configuration>
83+
</plugin>
84+
85+
</plugins>
86+
7387
</build>
7488

7589
<properties>
90+
<!-- Spring -->
91+
<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
92+
<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
93+
94+
<!-- persistence -->
95+
<hibernate.version>4.3.10.Final</hibernate.version>
96+
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
97+
98+
<!-- logging -->
99+
<org.slf4j.version>1.7.12</org.slf4j.version>
100+
<logback.version>1.1.3</logback.version>
101+
102+
<!-- various -->
103+
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
104+
105+
<!-- util -->
106+
<guava.version>18.0</guava.version>
107+
<commons-lang3.version>3.4</commons-lang3.version>
108+
109+
<!-- testing -->
110+
<org.hamcrest.version>1.3</org.hamcrest.version>
111+
<junit.version>4.11</junit.version>
112+
<mockito.version>1.10.19</mockito.version>
113+
114+
<httpcore.version>4.4.1</httpcore.version>
115+
<httpclient.version>4.5</httpclient.version>
116+
117+
<rest-assured.version>2.4.1</rest-assured.version>
118+
119+
<!-- Maven plugins -->
120+
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
121+
<maven-war-plugin.version>2.6</maven-war-plugin.version>
122+
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
123+
<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
76124

77125
</properties>
78126

0 commit comments

Comments
 (0)