Skip to content

Commit 26cfee0

Browse files
puredangerstuarthalloway
authored andcommitted
CLJ-1268 Switch build to jdk 1.6 and remove 1.5 support
Signed-off-by: Stuart Halloway <[email protected]>
1 parent f595354 commit 26cfee0

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
description="Compile Java sources.">
3939
<javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
4040
includeAntRuntime="false"
41-
debug="true" source="1.5" target="1.5"/>
41+
debug="true" source="1.6" target="1.6"/>
4242
</target>
4343

4444
<target name="compile-clojure"
@@ -83,7 +83,7 @@
8383
unless="maven.test.skip">
8484
<mkdir dir="${test-classes}"/>
8585
<javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes"
86-
debug="true" source="1.5" target="1.5" includeantruntime="no"/>
86+
debug="true" source="1.6" target="1.6" includeantruntime="no"/>
8787
<java classname="clojure.lang.Compile"
8888
classpath="${test-classes}:${test}:${build}:${cljsrc}"
8989
failonerror="true"

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
<artifactId>maven-compiler-plugin</artifactId>
7777
<version>2.3.2</version>
7878
<configuration>
79-
<source>1.5</source>
80-
<target>1.5</target>
79+
<source>1.6</source>
80+
<target>1.6</target>
8181
<encoding>${project.build.sourceEncoding}</encoding>
8282
</configuration>
8383
</plugin>

src/clj/clojure/java/javadoc.clj

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
(def ^:dynamic *core-java-api*
2222
(case (System/getProperty "java.specification.version")
23-
"1.5" "http://java.sun.com/j2se/1.5.0/docs/api/"
2423
"1.6" "http://java.sun.com/javase/6/docs/api/"
2524
"http://java.sun.com/javase/7/docs/api/"))
2625

test/clojure/test_clojure/annotations.clj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
(:use clojure.test))
1313

1414
(case (System/getProperty "java.specification.version")
15-
"1.5" (load "annotations/java_5")
1615
"1.6" (load "annotations/java_6")
1716
nil)
1817

0 commit comments

Comments
 (0)