Skip to content

Commit

Permalink
Java 8 is now minimum (#178)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsmiley authored Sep 28, 2020
1 parent 5c64068 commit a2f899e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@ sudo: false
script: mvn -Dhttpclient.version=$HTTPCLIENT_VERSION -Dhttpclient.test.version=$HTTPCLIENT_TEST_VERSION clean verify $JDOC

jdk:
- openjdk7
- oraclejdk8
- oraclejdk9
- openjdk8
- openjdk11

# We use httpclient test jar providing LocalTestServer.java; no longer in 4.4+.
# We only do javadoc test for the latest version (as it's the only official one)

env:
- HTTPCLIENT_VERSION=4.3.6 HTTPCLIENT_TEST_VERSION=4.3.6 JDOC=
- HTTPCLIENT_VERSION=4.4.1 HTTPCLIENT_TEST_VERSION=4.3.6 JDOC=
- HTTPCLIENT_VERSION=4.5.6 HTTPCLIENT_TEST_VERSION=4.3.6 JDOC=javadoc:javadoc
- HTTPCLIENT_VERSION=4.5.6 HTTPCLIENT_TEST_VERSION=4.3.6 JDOC=site

notifications:
email:
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Version 1.12 (unreleased)

Java 8 is now the minimum java version the servlet works with.

\#158: More extension points RE HttpClient building and cookies.
Thanks Mark Michaelis.

Expand Down
13 changes: 9 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<!-- Note: Java 1.6 has an issue parsing an HttpOnly flag in a Set-Cookie header, but
otherwise works. -->
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:all,-serial,-deprecation</arg>
</compilerArgs>
Expand Down Expand Up @@ -197,6 +195,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<source>8</source>
<additionalJOptions>
<additionalJOption>-Xdoclint:all</additionalJOption>
<additionalJOption>-Xdoclint:-missing</additionalJOption>
</additionalJOptions>
</configuration>
<reportSets>
<reportSet>
<reports>
Expand Down

0 comments on commit a2f899e

Please sign in to comment.