Skip to content

Commit 8ebbd1f

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

14 files changed

Lines changed: 57 additions & 27 deletions

File tree

‎spring-mvc-java/.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.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‎

Lines changed: 3 additions & 3 deletions
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‎

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-no-xml/pom.xml‎

Lines changed: 12 additions & 2 deletions
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‎

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-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‎

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-rest/.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-security-rest-basic-auth/.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-security-rest-custom/.settings/org.eclipse.wst.common.component‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 0 additions & 1 deletion
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>

0 commit comments

Comments
 (0)