diff --git a/.circleci/Dockerfile-openjdk7 b/.circleci/Dockerfile-openjdk7
deleted file mode 100644
index aab0800d..00000000
--- a/.circleci/Dockerfile-openjdk7
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM openjdk:7-jdk
-
-RUN apt update && apt install -y maven
diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index fbe8249b..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-version: 2.1
-
-orbs:
- win: circleci/windows@2.4.1
-
-commands:
- create_custom_cache_lock:
- description: "Create custom cache lock for java version."
- parameters:
- filename:
- type: string
- steps:
- - run:
- name: Grab java version and dump to file
- command: java -version > << parameters.filename >>
-
-default_steps: &default_steps
- steps:
- - checkout
-
- - run: |
- mvn clean install
- - run: cd dogstatsd-http-core && mvn clean install
-
-jobs:
- openjdk7:
- docker:
- - image: jfullaondo/openjdk:7
- <<: *default_steps
- openjdk8:
- docker: &jdk8
- - image: cimg/openjdk:8.0
- <<: *default_steps
- openjdk11:
- docker:
- - image: cimg/openjdk:11.0
- <<: *default_steps
- openjdk13:
- docker:
- - image: cimg/openjdk:13.0
- <<: *default_steps
- openjdk17:
- docker:
- - image: cimg/openjdk:17.0
- <<: *default_steps
-
-## Fails with "Source option 7 is no longer supported. Use 8 or later."
-# openjdk21:
-# docker:
-# - image: cimg/openjdk:21.0
-# <<: *default_steps
-
- windows-openjdk12:
- executor:
- # https://github.com/CircleCI-Public/windows-orb/blob/v2.4.1/src/executors/default.yml
- name: win/default
- # https://circleci.com/developer/machine/image/windows-server-2019
- version: 2023.04.1
- steps:
- - checkout
- - run: java -version
- - run: |
- choco install maven
- - run: |
- mvn clean install
-
- openjdk8-jnr-exclude:
- docker: *jdk8
- steps:
- - checkout
- - run: "mvn -Pjnr-exclude clean test"
- openjdk8-jnr-latest:
- docker: *jdk8
- steps:
- - checkout
- - run: "mvn clean test -DskipTests" # build main and test with default deps
- - run: "mvn -Pjnr-latest test" # run with modified deps
-
-workflows:
- version: 2
- agent-tests:
- jobs:
- - openjdk7
- - openjdk8
- - openjdk11
- - openjdk13
- - openjdk17
-# - openjdk21
- - windows-openjdk12
- - openjdk8-jnr-exclude
- - openjdk8-jnr-latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..ea450137
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: CI
+
+on:
+ push:
+ pull_request:
+
+jobs:
+ test:
+ name: Test (Java ${{ matrix.java-version }}, ${{ matrix.os }})
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-latest]
+ java-version: ['9', '11', '13', '17']
+ include:
+ - os: windows-latest
+ java-version: '12'
+ steps:
+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+ with:
+ java-version: ${{ matrix.java-version }}
+ distribution: zulu
+ cache: maven
+ - name: Build and test
+ run: mvn clean install
+ - name: Build and test dogstatsd-http-core
+ run: mvn clean install
+ working-directory: dogstatsd-http-core
+
+ test-jnr-exclude:
+ name: Test (Java 9, jnr-exclude)
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+ with:
+ java-version: '9'
+ distribution: zulu
+ cache: maven
+ - name: Build and test (jnr-exclude)
+ run: mvn clean test -P jnr-exclude
+
+ test-jnr-latest:
+ name: Test (Java 9, jnr-latest)
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+ with:
+ java-version: '9'
+ distribution: zulu
+ cache: maven
+ - name: Build with default dependencies
+ run: mvn clean install
+ - name: Test with latest jnr dependencies
+ run: mvn test -P jnr-latest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8672764c..437f07f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ deploy_to_sonatype:
tags:
- "docker-in-docker:amd64"
- image: maven:3.9-eclipse-temurin-8
+ image: maven:3.9-eclipse-temurin-17
script:
# Ensure we don't print commands being run to the logs during credential
diff --git a/pom.xml b/pom.xml
index fbea7216..60b136f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,7 +347,7 @@
- [1.7.0-0,1.9.0-0),[9.0,18.0-0)
+ [9.0,18.0-0)
@@ -372,8 +372,7 @@
maven-compiler-plugin
3.8.1
- 1.7
- 1.7
+ 7