Skip to content

Commit

Permalink
Decommission the support for Java 6
Browse files Browse the repository at this point in the history
It's going to the end of lifecycle, also it caused too many issues in
Travis CI build caused by "SunCertPathBuilderException: unable to find
valid certification path to requested target".
  • Loading branch information
bchen-godaddy committed Jun 20, 2017
1 parent 5d6dcf2 commit 09450f3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,8 +2,8 @@ language: java
jdk:
- oraclejdk7
- oraclejdk8
- openjdk6
- openjdk7
- openjdk8
before_install:
- chmod +x gradlew
#
Expand Down
20 changes: 16 additions & 4 deletions build.gradle
Expand Up @@ -155,12 +155,24 @@ task javadocJar(type: Jar, dependsOn:javadoc) {
task checkVersionNumbersInReadme << {
def readme = file("readme.md")
def looksLikeVersionNumber = ~/\d+\.\d+\.\d+/
def versionNumbersInReadmeFile = readme.readLines().collectMany { line ->
looksLikeVersionNumber.matcher(line).collect { match ->
(toolkitVersion == match) ? null : match
}.findResults{ x -> x }
def textNeedFixedVersion = 'Since version 3.7.6 the toolkit no longer support Java SE 6.'

def versionNumbersInReadmeFile = readme.readLines()
.findAll { line ->
!line.startsWith(textNeedFixedVersion)
}
.collectMany { line ->
looksLikeVersionNumber.matcher(line).collect { match ->
(toolkitVersion == match) ? null : match
}.findResults{ x -> x }
}

def decommissionJava6LineWithFixedVersion = readme.readLines().find {line ->
line.startsWith(textNeedFixedVersion)
}

assert versionNumbersInReadmeFile.isEmpty()
assert decommissionJava6LineWithFixedVersion != null
}

artifacts {
Expand Down
8 changes: 5 additions & 3 deletions readme.md
Expand Up @@ -8,7 +8,7 @@ For more information, please read [Installation and Setup](#installation-and-set

## Building

To build the ari-toolkit, you must have the Java Development Kit (JDK) v6.0 or above installed. The project can be built with the command `gradlew build`.
To build the ari-toolkit, you must have the Java Development Kit (JDK) v7.0 or above installed. The project can be built with the command `gradlew build`.


## Introduction
Expand Down Expand Up @@ -84,9 +84,11 @@ The javadoc is available online: [Toolkit javadoc](http://ausregistry.github.com

The following environment specifics are required:

#### Java 6
#### Java Support

The Toolkit has been developed against the standard Java 6 API, and has no runtime dependencies on external libraries.
The Toolkit has been developed against the standard Java API, and has no runtime dependencies on external libraries.

Since version 3.7.6 the toolkit no longer support Java SE 6. Only Java SE 7 and above are supported.

#### UTF-8 Encoding

Expand Down

0 comments on commit 09450f3

Please sign in to comment.