Skip to content

Commit 8ebbd1f

Browse files
author
eugenp
committed
maven work
1 parent 6286569 commit 8ebbd1f

File tree

14 files changed

+57
-27
lines changed

14 files changed

+57
-27
lines changed

‎spring-mvc-java/.classpath

+1-1
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.6">
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-mvc-no-xml/.classpath

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +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.7">
3132
<attributes>
3233
<attribute name="maven.pomderived" value="true"/>
33-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3434
</attributes>
3535
</classpathentry>
3636
<classpathentry kind="output" path="target/classes"/>

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

+2-1
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-no-xml/pom.xml

+12-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<artifactId>log4j-over-slf4j</artifactId>
6464
<version>${org.slf4j.version}</version>
6565
</dependency>
66-
66+
6767
<!-- test scoped -->
6868

6969
<dependency>
@@ -105,7 +105,17 @@
105105
</resources>
106106

107107
<plugins>
108-
108+
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-compiler-plugin</artifactId>
112+
<version>3.1</version>
113+
<configuration>
114+
<source>1.7</source>
115+
<target>1.7</target>
116+
</configuration>
117+
</plugin>
118+
109119
<plugin>
110120
<groupId>org.apache.maven.plugins</groupId>
111121
<artifactId>maven-war-plugin</artifactId>

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

+1-1
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-xml"/>
87
<property name="java-output-path" value="/spring-mvc-xml/target/classes"/>
8+
<property name="context-root" value="spring-mvc"/>
99
</wb-module>
1010
</project-modules>

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

+2-1
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-rest/.settings/org.eclipse.wst.validation.prefs

+2-1
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-security-rest-basic-auth/.settings/org.eclipse.wst.validation.prefs

+2-1
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-security-rest-custom/.settings/org.eclipse.wst.common.component

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
87
<property name="context-root" value="spring-security-rest-custom"/>
98
<property name="java-output-path" value="/spring-security-rest-custom/target/classes"/>
109
</wb-module>

‎spring-security-rest-digest-auth/.settings/org.eclipse.wst.common.component

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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-
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
87
<property name="context-root" value="spring-security-rest-digest-auth"/>
98
<property name="java-output-path" value="/spring-security-rest-digest-auth/target/classes"/>
109
</wb-module>

‎spring-security-rest-digest-auth/.settings/org.eclipse.wst.validation.prefs

+2-1
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-security-rest-full/.classpath

+9-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@
1616
<attribute name="maven.pomderived" value="true"/>
1717
</attributes>
1818
</classpathentry>
19-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
19+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2020
<attributes>
2121
<attribute name="maven.pomderived" value="true"/>
22+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2223
</attributes>
2324
</classpathentry>
24-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
25+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
26+
<attributes>
27+
<attribute name="optional" value="true"/>
28+
<attribute name="maven.pomderived" value="true"/>
29+
</attributes>
30+
</classpathentry>
31+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
2532
<attributes>
2633
<attribute name="maven.pomderived" value="true"/>
27-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2834
</attributes>
2935
</classpathentry>
3036
<classpathentry kind="output" path="target/classes"/>

‎spring-security-rest-full/.settings/org.eclipse.wst.validation.prefs

+2-1
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-security-rest-full/pom.xml

+19-9
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<artifactId>guava</artifactId>
133133
<version>${guava.version}</version>
134134
</dependency>
135-
135+
136136
<!-- logging -->
137137

138138
<dependency>
@@ -157,7 +157,7 @@
157157
<artifactId>log4j-over-slf4j</artifactId>
158158
<version>${org.slf4j.version}</version>
159159
</dependency>
160-
160+
161161
<!-- test scoped -->
162162

163163
<dependency>
@@ -200,6 +200,22 @@
200200

201201
<plugins>
202202

203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-compiler-plugin</artifactId>
206+
<version>3.1</version>
207+
<configuration>
208+
<source>1.7</source>
209+
<target>1.7</target>
210+
</configuration>
211+
</plugin>
212+
213+
<plugin>
214+
<groupId>org.apache.maven.plugins</groupId>
215+
<artifactId>maven-war-plugin</artifactId>
216+
<version>${maven-war-plugin.version}</version>
217+
</plugin>
218+
203219
<plugin>
204220
<groupId>org.apache.maven.plugins</groupId>
205221
<artifactId>maven-surefire-plugin</artifactId>
@@ -235,12 +251,6 @@
235251
</configuration>
236252
</plugin>
237253

238-
<plugin>
239-
<groupId>org.apache.maven.plugins</groupId>
240-
<artifactId>maven-war-plugin</artifactId>
241-
<version>${maven-war-plugin.version}</version>
242-
</plugin>
243-
244254
</plugins>
245255

246256
</build>
@@ -285,7 +295,7 @@
285295
<maven-war-plugin.version>2.4</maven-war-plugin.version>
286296
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
287297
<cargo-maven2-plugin.version>1.4.5</cargo-maven2-plugin.version>
288-
298+
289299
</properties>
290300

291301
</project>

0 commit comments

Comments
 (0)