Skip to content

Commit 930c34c

Browse files
author
eugenp
committed
Eclipse cleanup and maven build fix
1 parent 1ea85b4 commit 930c34c

6 files changed

Lines changed: 187 additions & 164 deletions

File tree

‎spring-mvc-java/.classpath‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
<attribute name="maven.pomderived" value="true"/>
2323
</attributes>
2424
</classpathentry>
25-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
25+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2626
<attributes>
2727
<attribute name="maven.pomderived" value="true"/>
28+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2829
</attributes>
2930
</classpathentry>
30-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
31+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
3132
<attributes>
32-
<attribute name="maven.pomderived" value="true"/>
33+
<attribute name="owner.project.facets" value="java"/>
3334
</attributes>
3435
</classpathentry>
3536
<classpathentry kind="output" path="target/classes"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ 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
9-
org.eclipse.jdt.core.compiler.compliance=1.7
8+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
9+
org.eclipse.jdt.core.compiler.compliance=1.6
1010
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
1111
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1212
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -88,4 +88,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
8888
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
8989
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9090
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
91-
org.eclipse.jdt.core.compiler.source=1.7
91+
org.eclipse.jdt.core.compiler.source=1.6

‎spring-mvc-java/.settings/org.eclipse.wst.common.component‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
55
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
66
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
7-
<property name="context-root" value="spring-mvc-java"/>
87
<property name="java-output-path" value="/spring-mvc-java/target/classes"/>
8+
<property name="context-root" value="spring-mvc"/>
99
</wb-module>
1010
</project-modules>

‎spring-mvc-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,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
33
<installed facet="wst.jsdt.web" version="1.0"/>
4-
<installed facet="java" version="1.7"/>
54
<installed facet="jst.web" version="3.0"/>
5+
<installed facet="java" version="1.6"/>
66
</faceted-project>

‎spring-mvc-java/.settings/org.eclipse.wst.validation.prefs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
DELEGATES_PREFERENCE=delegateValidatorList
22
USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
33
USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
4-
USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.303.v201202090300
4+
USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
5+
disabled=06target
56
eclipse.preferences.version=1
67
override=true
78
suspend=false

‎spring-mvc-java/pom.xml‎

Lines changed: 176 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,179 @@
11
<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">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.baeldung</groupId>
4-
<artifactId>spring-mvc-java</artifactId>
5-
<version>0.1-SNAPSHOT</version>
6-
7-
<name>spring-mvc-java</name>
8-
<packaging>war</packaging>
9-
10-
<dependencies>
11-
12-
<!-- Spring -->
13-
14-
<dependency>
15-
<groupId>org.springframework</groupId>
16-
<artifactId>spring-web</artifactId>
17-
<version>${org.springframework.version}</version>
18-
</dependency>
19-
<dependency>
20-
<groupId>org.springframework</groupId>
21-
<artifactId>spring-webmvc</artifactId>
22-
<version>${org.springframework.version}</version>
23-
</dependency>
24-
25-
<!-- web -->
26-
27-
<dependency>
28-
<groupId>javax.servlet</groupId>
29-
<artifactId>javax.servlet-api</artifactId>
30-
<version>3.0.1</version>
31-
<scope>provided</scope>
32-
</dependency>
33-
34-
<dependency>
35-
<groupId>javax.servlet</groupId>
36-
<artifactId>jstl</artifactId>
37-
<version>1.2</version>
38-
<scope>runtime</scope>
39-
</dependency>
40-
41-
<!-- test scoped -->
42-
43-
<dependency>
44-
<groupId>junit</groupId>
45-
<artifactId>junit-dep</artifactId>
46-
<version>${junit.version}</version>
47-
<scope>test</scope>
48-
</dependency>
49-
50-
<dependency>
51-
<groupId>org.hamcrest</groupId>
52-
<artifactId>hamcrest-core</artifactId>
53-
<version>${org.hamcrest.version}</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.hamcrest</groupId>
58-
<artifactId>hamcrest-library</artifactId>
59-
<version>${org.hamcrest.version}</version>
60-
<scope>test</scope>
61-
</dependency>
62-
63-
<dependency>
64-
<groupId>org.mockito</groupId>
65-
<artifactId>mockito-core</artifactId>
66-
<version>${mockito.version}</version>
67-
<scope>test</scope>
68-
</dependency>
69-
70-
</dependencies>
71-
72-
<build>
73-
<finalName>spring-mvc</finalName>
74-
<resources>
75-
<resource>
76-
<directory>src/main/resources</directory>
77-
<filtering>true</filtering>
78-
</resource>
79-
</resources>
80-
81-
<plugins>
82-
83-
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-surefire-plugin</artifactId>
86-
<version>${maven-surefire-plugin.version}</version>
87-
<configuration>
88-
<excludes>
89-
<!-- <exclude>**/*ProductionTest.java</exclude> -->
90-
</excludes>
91-
<systemPropertyVariables>
92-
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
93-
</systemPropertyVariables>
94-
</configuration>
95-
</plugin>
96-
97-
<plugin>
98-
<groupId>org.codehaus.cargo</groupId>
99-
<artifactId>cargo-maven2-plugin</artifactId>
100-
<version>${cargo-maven2-plugin.version}</version>
101-
<configuration>
102-
<wait>true</wait>
103-
<container>
104-
<containerId>jetty8x</containerId>
105-
<type>embedded</type>
106-
<systemProperties>
107-
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
108-
</systemProperties>
109-
</container>
110-
<configuration>
111-
<properties>
112-
<cargo.servlet.port>8082</cargo.servlet.port>
113-
</properties>
114-
</configuration>
115-
</configuration>
116-
</plugin>
117-
118-
</plugins>
119-
120-
</build>
121-
122-
<properties>
123-
<!-- Spring -->
124-
<org.springframework.version>3.2.4.RELEASE</org.springframework.version>
125-
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
126-
127-
<!-- persistence -->
128-
<hibernate.version>4.2.4.Final</hibernate.version>
129-
<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
130-
131-
<!-- logging -->
132-
<org.slf4j.version>1.7.5</org.slf4j.version>
133-
<logback.version>1.0.11</logback.version>
134-
135-
<!-- various -->
136-
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
137-
138-
<!-- util -->
139-
<guava.version>14.0.1</guava.version>
140-
<commons-lang3.version>3.1</commons-lang3.version>
141-
142-
<!-- testing -->
143-
<org.hamcrest.version>1.3</org.hamcrest.version>
144-
<junit.version>4.11</junit.version>
145-
<mockito.version>1.9.5</mockito.version>
146-
147-
<httpcore.version>4.2.4</httpcore.version>
148-
<httpclient.version>4.2.5</httpclient.version>
149-
150-
<rest-assured.version>1.8.1</rest-assured.version>
151-
<groovy.version>1.8.9</groovy.version>
152-
153-
<!-- Maven plugins -->
154-
<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
155-
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
156-
</properties>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.baeldung</groupId>
4+
<artifactId>spring-mvc-java</artifactId>
5+
<version>0.1-SNAPSHOT</version>
6+
7+
<name>spring-mvc-java</name>
8+
<packaging>war</packaging>
9+
10+
<dependencies>
11+
12+
<!-- Spring -->
13+
14+
<dependency>
15+
<groupId>org.springframework</groupId>
16+
<artifactId>spring-web</artifactId>
17+
<version>${org.springframework.version}</version>
18+
</dependency>
19+
<dependency>
20+
<groupId>org.springframework</groupId>
21+
<artifactId>spring-webmvc</artifactId>
22+
<version>${org.springframework.version}</version>
23+
</dependency>
24+
25+
<!-- web -->
26+
27+
<dependency>
28+
<groupId>javax.servlet</groupId>
29+
<artifactId>javax.servlet-api</artifactId>
30+
<version>3.0.1</version>
31+
<scope>provided</scope>
32+
</dependency>
33+
34+
<dependency>
35+
<groupId>javax.servlet</groupId>
36+
<artifactId>jstl</artifactId>
37+
<version>1.2</version>
38+
<scope>runtime</scope>
39+
</dependency>
40+
41+
<!-- test scoped -->
42+
43+
<dependency>
44+
<groupId>junit</groupId>
45+
<artifactId>junit-dep</artifactId>
46+
<version>${junit.version}</version>
47+
<scope>test</scope>
48+
</dependency>
49+
50+
<dependency>
51+
<groupId>org.hamcrest</groupId>
52+
<artifactId>hamcrest-core</artifactId>
53+
<version>${org.hamcrest.version}</version>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.hamcrest</groupId>
58+
<artifactId>hamcrest-library</artifactId>
59+
<version>${org.hamcrest.version}</version>
60+
<scope>test</scope>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>org.mockito</groupId>
65+
<artifactId>mockito-core</artifactId>
66+
<version>${mockito.version}</version>
67+
<scope>test</scope>
68+
</dependency>
69+
70+
</dependencies>
71+
72+
<build>
73+
<finalName>spring-mvc</finalName>
74+
<resources>
75+
<resource>
76+
<directory>src/main/resources</directory>
77+
<filtering>true</filtering>
78+
</resource>
79+
</resources>
80+
81+
<plugins>
82+
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-surefire-plugin</artifactId>
86+
<version>${maven-surefire-plugin.version}</version>
87+
<configuration>
88+
<excludes>
89+
<!-- <exclude>**/*ProductionTest.java</exclude> -->
90+
</excludes>
91+
<systemPropertyVariables>
92+
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
93+
</systemPropertyVariables>
94+
</configuration>
95+
</plugin>
96+
97+
<plugin>
98+
<groupId>org.codehaus.cargo</groupId>
99+
<artifactId>cargo-maven2-plugin</artifactId>
100+
<version>${cargo-maven2-plugin.version}</version>
101+
<configuration>
102+
<wait>true</wait>
103+
<container>
104+
<containerId>jetty8x</containerId>
105+
<type>embedded</type>
106+
<systemProperties>
107+
<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
108+
</systemProperties>
109+
</container>
110+
<configuration>
111+
<properties>
112+
<cargo.servlet.port>8082</cargo.servlet.port>
113+
</properties>
114+
</configuration>
115+
</configuration>
116+
</plugin>
117+
118+
<plugin>
119+
<artifactId>maven-compiler-plugin</artifactId>
120+
<version>${maven-compiler-plugin.version}</version>
121+
<configuration>
122+
<source>1.6</source>
123+
<target>1.6</target>
124+
</configuration>
125+
</plugin>
126+
127+
<plugin>
128+
<groupId>org.apache.maven.plugins</groupId>
129+
<artifactId>maven-war-plugin</artifactId>
130+
<version>2.4</version>
131+
<configuration>
132+
<failOnMissingWebXml>false</failOnMissingWebXml>
133+
</configuration>
134+
</plugin>
135+
136+
</plugins>
137+
138+
</build>
139+
140+
<properties>
141+
<!-- Spring -->
142+
<org.springframework.version>3.2.5.RELEASE</org.springframework.version>
143+
<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
144+
145+
<!-- persistence -->
146+
<hibernate.version>4.2.8.Final</hibernate.version>
147+
<mysql-connector-java.version>5.1.27</mysql-connector-java.version>
148+
149+
<!-- logging -->
150+
<org.slf4j.version>1.7.5</org.slf4j.version>
151+
<logback.version>1.0.11</logback.version>
152+
153+
<!-- various -->
154+
<hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
155+
156+
<!-- util -->
157+
<guava.version>15.0</guava.version>
158+
<commons-lang3.version>3.1</commons-lang3.version>
159+
160+
<!-- testing -->
161+
<org.hamcrest.version>1.3</org.hamcrest.version>
162+
<junit.version>4.11</junit.version>
163+
<mockito.version>1.9.5</mockito.version>
164+
165+
<httpcore.version>4.3</httpcore.version>
166+
<httpclient.version>4.3.1</httpclient.version>
167+
168+
<rest-assured.version>2.0.1</rest-assured.version>
169+
<groovy.version>1.8.9</groovy.version>
170+
171+
<!-- maven plugins -->
172+
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
173+
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
174+
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
175+
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
176+
177+
</properties>
157178

158179
</project>

0 commit comments

Comments
 (0)