Skip to content

Commit

Permalink
Prepare for v1.13.0 Release (#110)
Browse files Browse the repository at this point in the history
* Prepare for v1.13.0 Release
  • Loading branch information
hyperxpro committed Nov 2, 2023
1 parent e37f6a9 commit 397cf0e
Show file tree
Hide file tree
Showing 16 changed files with 71 additions and 27 deletions.
46 changes: 45 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -31,7 +31,7 @@ For maven, the natives will
<dependency>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>
```

Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j-parent</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>

<artifactId>all</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion brotli4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>brotli4j-parent</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-aarch64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-armv7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-ppc64le/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-riscv64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-s390x/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/linux-x86_64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/osx-aarch64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/osx-x86_64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j-parent</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion natives/windows-x86_64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>natives</artifactId>
<groupId>com.aayushatharva.brotli4j</groupId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j-parent</artifactId>
<packaging>pom</packaging>
<version>1.12.0</version>
<version>1.13.0</version>

<name>Brotli4j</name>
<description>Brotli4j provides Brotli compression and decompression for Java.</description>
Expand Down Expand Up @@ -95,7 +95,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.95.Final</version>
<version>4.1.100.Final</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j-parent</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</parent>

<artifactId>service</artifactId>
Expand Down

0 comments on commit 397cf0e

Please sign in to comment.