diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9cead67d..669c267c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -360,12 +360,56 @@ jobs: curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh jabba install 11.0.0-custom=tgz+https://cdn.azul.com/zulu-embedded/bin/zulu11.60.19-ca-jdk11.0.17-linux_aarch32hf.tar.gz -o /jdk - + run: | export JAVA_HOME="/jdk" chmod +x ./mvnw ./mvnw -B --show-version -ntp clean package + + Linux-ArmV7-Build-JDK17: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/cache@v3 + env: + cache-name: cache-m2-repository-${{ runner.os }}-jdk11-armv7 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-pr-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-pr-${{ matrix.arch }}-pr-${{ env.cache-name }}-pr- + - uses: uraimo/run-on-arch-action@v2.4.0 + name: Run commands + id: runcmd + with: + arch: armv7 + distro: ubuntu18.04 + + # Not required, but speeds up builds by storing container images in + # a GitHub package registry. + githubToken: ${{ github.token }} + + # Mount the .m2/repository + dockerRunArgs: | + --platform linux/arm/v7 + --volume "/home/runner/.m2/repository/:/root/.m2/repository" + + # Install dependencies + install: | + apt-get update + apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential apt-transport-https wget + mkdir -p /etc/apt/keyrings + wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc + echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list + + apt-get update + apt install temurin-17-jdk -y + run: | + export MAVEN_OPTS="-Djdk.lang.Process.launchMechanism=vfork" + chmod +x ./mvnw + ./mvnw -B --show-version -ntp clean package + Linux-s390x-Build-JDK8: runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index 0f3ccba2..4548f61f 100644 --- a/README.md +++ b/README.md @@ -8,15 +8,15 @@ Brotli4j provides Brotli compression and decompression for Java. | Module | Architecture | Tested On | |:------------------------------|:------------:|--------------------------------:| -| Windows (Windows Server 2022) | x64 | JDK 1.8, JDK 11, JDK 17 | -| Linux (CentOS 6) | x64 | JDK 1.8, JDK 11, JDK 17 | -| Linux (Ubuntu 18.04) | Aarch64 | JDK 1.8, JDK 11, JDK 17 | -| Linux (Ubuntu 18.04) | ARMv7 | JDK 1.8, JDK 11 | +| Windows (Windows Server 2022) | x64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | +| Linux (CentOS 6) | x64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | +| Linux (Ubuntu 18.04) | Aarch64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | +| Linux (Ubuntu 18.04) | ARMv7 | JDK 1.8, JDK 11, JDK 17 | | Linux (Ubuntu 18.04) | s390x | JDK 1.8, JDK 11 | -| Linux (Ubuntu 18.04) | ppc64le | JDK 1.8, JDK 11 | -| Linux (Ubuntu 20.04) | RISC-V64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | -| macOS (Catalina) | x64 | JDK 1.8, JDK 11, JDK 17 | -| macOS (Catalina) | Aarch64 | JDK 1.8, JDK 11, JDK 17 | +| Linux (Ubuntu 18.04) | ppc64le | JDK 1.8, JDK 11 | +| Linux (Ubuntu 20.04) | RISC-v64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | +| macOS (Catalina) | x64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | +| macOS (Catalina) | Aarch64 | JDK 1.8, JDK 11, JDK 17, JDK 21 | #### *Install [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170) before running this library on Windows @@ -31,7 +31,7 @@ For maven, the natives will com.aayushatharva.brotli4j brotli4j - 1.12.0 + 1.13.0 ``` @@ -47,7 +47,7 @@ import org.gradle.nativeplatform.platform.internal.Architectures import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.gradle.nativeplatform.operatingsystem.OperatingSystem -val brotliVersion = "1.12.0" +val brotliVersion = "1.13.0" val operatingSystem: OperatingSystem = DefaultNativePlatform.getCurrentOperatingSystem() repositories { @@ -93,7 +93,7 @@ dependencies { import org.gradle.nativeplatform.platform.internal.Architectures import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform -def brotliVersion = "1.12.0" +def brotliVersion = "1.13.0" def operatingSystem = DefaultNativePlatform.getCurrentOperatingSystem() repositories { diff --git a/all/pom.xml b/all/pom.xml index ea81ad2b..272b8fb3 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -23,7 +23,7 @@ com.aayushatharva.brotli4j brotli4j-parent - 1.12.0 + 1.13.0 all diff --git a/brotli4j/pom.xml b/brotli4j/pom.xml index 637c3f65..07cc4787 100644 --- a/brotli4j/pom.xml +++ b/brotli4j/pom.xml @@ -22,7 +22,7 @@ brotli4j-parent com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-aarch64/pom.xml b/natives/linux-aarch64/pom.xml index aa6561b7..1aed2eb4 100644 --- a/natives/linux-aarch64/pom.xml +++ b/natives/linux-aarch64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-armv7/pom.xml b/natives/linux-armv7/pom.xml index 2f6a954a..82d2c35a 100644 --- a/natives/linux-armv7/pom.xml +++ b/natives/linux-armv7/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-ppc64le/pom.xml b/natives/linux-ppc64le/pom.xml index 7ea1d7af..71e54e7f 100644 --- a/natives/linux-ppc64le/pom.xml +++ b/natives/linux-ppc64le/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-riscv64/pom.xml b/natives/linux-riscv64/pom.xml index e94a9771..f603647b 100644 --- a/natives/linux-riscv64/pom.xml +++ b/natives/linux-riscv64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-s390x/pom.xml b/natives/linux-s390x/pom.xml index 53236242..d4bcff9c 100644 --- a/natives/linux-s390x/pom.xml +++ b/natives/linux-s390x/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/linux-x86_64/pom.xml b/natives/linux-x86_64/pom.xml index 9b90a691..966376fa 100644 --- a/natives/linux-x86_64/pom.xml +++ b/natives/linux-x86_64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/osx-aarch64/pom.xml b/natives/osx-aarch64/pom.xml index 2cd197f5..be2a0388 100644 --- a/natives/osx-aarch64/pom.xml +++ b/natives/osx-aarch64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/osx-x86_64/pom.xml b/natives/osx-x86_64/pom.xml index f5bca7f8..187af2d5 100644 --- a/natives/osx-x86_64/pom.xml +++ b/natives/osx-x86_64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/pom.xml b/natives/pom.xml index 218f008b..2b3dabf5 100644 --- a/natives/pom.xml +++ b/natives/pom.xml @@ -21,7 +21,7 @@ com.aayushatharva.brotli4j brotli4j-parent - 1.12.0 + 1.13.0 4.0.0 diff --git a/natives/windows-x86_64/pom.xml b/natives/windows-x86_64/pom.xml index cf7217e8..ada44e3a 100644 --- a/natives/windows-x86_64/pom.xml +++ b/natives/windows-x86_64/pom.xml @@ -22,7 +22,7 @@ natives com.aayushatharva.brotli4j - 1.12.0 + 1.13.0 4.0.0 diff --git a/pom.xml b/pom.xml index 322ecdd4..92014c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.aayushatharva.brotli4j brotli4j-parent pom - 1.12.0 + 1.13.0 Brotli4j Brotli4j provides Brotli compression and decompression for Java. @@ -95,7 +95,7 @@ io.netty netty-buffer - 4.1.95.Final + 4.1.100.Final compile true diff --git a/service/pom.xml b/service/pom.xml index 40f0174b..85b72c17 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -6,7 +6,7 @@ com.aayushatharva.brotli4j brotli4j-parent - 1.12.0 + 1.13.0 service