Skip to content

Commit bae8efe

Browse files
author
eugenp
committed
maven work
1 parent 3199aa3 commit bae8efe

18 files changed

Lines changed: 128 additions & 16 deletions

File tree

spring-security-basic-auth/.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3131
<attributes>
3232
<attribute name="maven.pomderived" value="true"/>
33+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3334
</attributes>
3435
</classpathentry>
3536
<classpathentry kind="output" path="target/classes"/>

spring-security-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-basic-auth/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,22 @@
138138

139139
<plugins>
140140

141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-compiler-plugin</artifactId>
144+
<version>${maven-compiler-plugin.version}</version>
145+
<configuration>
146+
<source>1.7</source>
147+
<target>1.7</target>
148+
</configuration>
149+
</plugin>
150+
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-war-plugin</artifactId>
154+
<version>${maven-war-plugin.version}</version>
155+
</plugin>
156+
141157
<plugin>
142158
<groupId>org.apache.maven.plugins</groupId>
143159
<artifactId>maven-surefire-plugin</artifactId>

spring-security-mvc-custom/.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,11 @@
2727
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2828
</attributes>
2929
</classpathentry>
30+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
31+
<attributes>
32+
<attribute name="optional" value="true"/>
33+
<attribute name="maven.pomderived" value="true"/>
34+
</attributes>
35+
</classpathentry>
3036
<classpathentry kind="output" path="target/classes"/>
3137
</classpath>

spring-security-mvc-custom/.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-mvc-custom/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,22 @@
143143

144144
<plugins>
145145

146+
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
148+
<artifactId>maven-compiler-plugin</artifactId>
149+
<version>${maven-compiler-plugin.version}</version>
150+
<configuration>
151+
<source>1.7</source>
152+
<target>1.7</target>
153+
</configuration>
154+
</plugin>
155+
156+
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
158+
<artifactId>maven-war-plugin</artifactId>
159+
<version>${maven-war-plugin.version}</version>
160+
</plugin>
161+
146162
<plugin>
147163
<groupId>org.apache.maven.plugins</groupId>
148164
<artifactId>maven-surefire-plugin</artifactId>

spring-security-mvc-digest-auth/.classpath

Lines changed: 9 additions & 3 deletions
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-mvc-digest-auth/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
66
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
77
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
88
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
9-
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
109
org.eclipse.jdt.core.compiler.compliance=1.7
11-
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
12-
org.eclipse.jdt.core.compiler.debug.localVariable=generate
13-
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1410
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
1511
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1612
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

spring-security-mvc-digest-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-mvc-digest-auth/pom.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>com.google.guava</groupId>
9595
<artifactId>guava</artifactId>
96-
<version>14.0.1</version>
96+
<version>${guava.version}</version>
9797
</dependency>
9898

9999
<!-- test scoped -->
@@ -137,7 +137,23 @@
137137
</resources>
138138

139139
<plugins>
140-
140+
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-compiler-plugin</artifactId>
144+
<version>${maven-compiler-plugin.version}</version>
145+
<configuration>
146+
<source>1.7</source>
147+
<target>1.7</target>
148+
</configuration>
149+
</plugin>
150+
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-war-plugin</artifactId>
154+
<version>${maven-war-plugin.version}</version>
155+
</plugin>
156+
141157
<plugin>
142158
<groupId>org.apache.maven.plugins</groupId>
143159
<artifactId>maven-surefire-plugin</artifactId>

0 commit comments

Comments
 (0)