Skip to content

Commit 4864a9f

Browse files
authored
Upgrade to commons-fileupload:1.5. (#50)
- Update eclipse files to Java 11 (eclipse files already in git)
1 parent dc11d99 commit 4864a9f

5 files changed

+27
-8
lines changed

.classpath

+9-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1010
<attributes>
1111
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="optional" value="true"/>
1213
</attributes>
1314
</classpathentry>
1415
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@@ -18,7 +19,7 @@
1819
<attribute name="test" value="true"/>
1920
</attributes>
2021
</classpathentry>
21-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
2223
<attributes>
2324
<attribute name="maven.pomderived" value="true"/>
2425
</attributes>
@@ -30,5 +31,12 @@
3031
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3132
</attributes>
3233
</classpathentry>
34+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
35+
<attributes>
36+
<attribute name="maven.pomderived" value="true"/>
37+
<attribute name="test" value="true"/>
38+
<attribute name="optional" value="true"/>
39+
</attributes>
40+
</classpathentry>
3341
<classpathentry kind="output" path="target/classes"/>
3442
</classpath>

.settings/org.eclipse.jdt.core.prefs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.8
6+
org.eclipse.jdt.core.compiler.compliance=11
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1213
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1315
org.eclipse.jdt.core.compiler.release=disabled
14-
org.eclipse.jdt.core.compiler.source=1.8
16+
org.eclipse.jdt.core.compiler.source=11
+11-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2-
<wb-module deploy-name="fits-1.2.1-SNAPSHOT">
2+
3+
<wb-module deploy-name="fits-2.1.0-SNAPSHOT">
34
<wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
5+
46
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
7+
58
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
9+
610
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
11+
712
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
13+
814
<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
15+
916
<property name="java-output-path" value="/FITSservlet_GitHub/bin"/>
10-
<property name="context-root" value="fits"/>
17+
<property name="context-root" value="fits-2.1.0-SNAPSHOT"/>
18+
1119
</wb-module>
20+
1221
</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<fixed facet="wst.jsdt.web"/>
44
<installed facet="jst.web" version="3.0"/>
55
<installed facet="wst.jsdt.web" version="1.0"/>
6-
<installed facet="java" version="1.8"/>
6+
<installed facet="java" version="11"/>
77
</faceted-project>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>commons-fileupload</groupId>
100100
<artifactId>commons-fileupload</artifactId>
101-
<version>1.4</version>
101+
<version>1.5</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>commons-lang</groupId>

0 commit comments

Comments
 (0)