Update apache commons

Reviewed-on: #30

.dockerignore

@@ -1,5 +1,5 @@
 .git
-.gitlab-ci.yml
+.github
 .idea
 .mvn
 src

.github/workflows/ci.yml

@@ -0,0 +1,133 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - "main"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  package:
+    name: Package
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Set up JDK
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+          cache: 'maven'
+
+      - name: Build package
+        run: |
+          chmod +x ./mvnw
+          ./mvnw --batch-mode --update-snapshots verify
+
+      - name: Upload test reports
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: junit-reports
+          path: |
+            **/target/*-reports/TEST-*.xml
+          if-no-files-found: ignore
+
+      - name: Upload Maven artifacts
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: maven-artifacts
+          path: |
+            target/netneutrality.jar
+            startup.sh
+          if-no-files-found: error
+
+  maven-publish:
+    name: Publish Maven Package
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    needs: package
+    if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Set up JDK
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+          cache: 'maven'
+          server-id: gitea
+          server-username: REGISTRY_USER
+          server-password: REGISTRY_PASSWORD
+
+      - name: Publish Maven package
+        run: |
+          chmod +x ./mvnw
+          ./mvnw --batch-mode deploy -DskipTests
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+
+  docker:
+    name: Docker Build and Push
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    needs: package
+    if: ${{ github.event_name == 'push' }}
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Download build artifacts
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: maven-artifacts
+          path: .
+
+      - name: Compute Docker tags
+        id: meta
+        shell: bash
+        run: |
+          REGISTRY="${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality"
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            ver="${GITHUB_REF_NAME#v}"
+            echo "tags=${REGISTRY}:${ver},${REGISTRY}:latest" >> "$GITHUB_OUTPUT"
+          else
+            echo "tags=${REGISTRY}:main" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Log in to registry
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
+        with:
+          registry: ${{ secrets.REGISTRY_URL }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:buildcache
+          cache-to: type=registry,ref=${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:buildcache,mode=max

.gitlab-ci.yml

@@ -1,101 +0,0 @@
-image: docker.io/library/eclipse-temurin:25-jdk-alpine@sha256:da683f4f02f9427597d8fa162b73b8222fe08596dcebaf23e4399576ff8b037e
-
-variables:
-  MAVEN_OPTS: >-
-    -Dhttps.protocols=TLSv1.2
-    -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository
-    -Dorg.slf4j.simpleLogger.showDateTime=true
-    -Djava.awt.headless=true
-
-  MAVEN_CLI_OPTS: >-
-    --batch-mode
-    --errors
-    --fail-at-end
-    --show-version
-    --no-transfer-progress
-    -DinstallAtEnd=true
-    -DdeployAtEnd=true
-
-cache:
-  key: ${CI_PROJECT_NAME}-${CI_COMMIT_REF_SLUG}
-  paths:
-    - .m2/repository
-    - .mvn
-  policy: pull-push
-
-stages:
-  - compile
-  - test
-  - package
-  - docker-build
-
-compile:
-  stage: compile
-  script:
-    - "chmod +x ./mvnw"
-    - "./mvnw $MAVEN_CLI_OPTS compile"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_BRANCH == "main"'
-    - if: '$CI_COMMIT_TAG'
-
-test:
-  stage: test
-  script:
-    - "chmod +x ./mvnw"
-    - "./mvnw $MAVEN_CLI_OPTS test"
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "**/target/*-reports/TEST-*.xml"
-      codequality:
-        - "target/gl-code-quality-report.json"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_BRANCH == "main"'
-    - if: '$CI_COMMIT_TAG'
-
-package:
-  stage: package
-  script:
-    - "chmod +x ./mvnw"
-    - "./mvnw $MAVEN_CLI_OPTS package -DskipTests=true"
-  artifacts:
-    name: "Maven artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"
-    paths:
-      - target/netneutrality.jar
-      - startup.sh
-    expire_in: 1 week
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
-    - if: '$CI_COMMIT_TAG'
-
-docker-build-main:
-  stage: docker-build
-  image: quay.io/buildah/stable
-  needs:
-    - job: package
-      artifacts: true
-  script:
-    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - buildah bud -f Dockerfile -t $CI_REGISTRY_IMAGE:main .
-    - buildah push $CI_REGISTRY_IMAGE:main
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
-
-docker-build-release:
-  stage: docker-build
-  image: quay.io/buildah/stable
-  needs:
-    - job: package
-      artifacts: true
-  script:
-    - export RELEASE_VERSION="${CI_COMMIT_TAG#v}"
-    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - buildah bud -f Dockerfile -t $CI_REGISTRY_IMAGE:$RELEASE_VERSION .
-    - buildah push $CI_REGISTRY_IMAGE:$RELEASE_VERSION
-    - buildah tag $CI_REGISTRY_IMAGE:$RELEASE_VERSION $CI_REGISTRY_IMAGE:latest
-    - buildah push $CI_REGISTRY_IMAGE:latest
-  rules:
-    - if: '$CI_COMMIT_TAG'

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
 wrapperVersion=3.3.4
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/eclipse-temurin:25-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9
+FROM eclipse-temurin:25-jre@sha256:ff82c74a630c08b417502c4c18189e62074edbb28eb1f2d31b799ac138c01058
 
 RUN apt-get update && apt-get install -y --no-install-recommends netcat-openbsd curl && rm -rf /var/lib/apt/lists/*
 

docker-compose.yml

@@ -15,7 +15,7 @@ services:
       - MARIADB_AUTO_UPGRADE=1
 
   netneutrality-bot:
-    image: registry.bobert.me/anthorob/netneutrality:${NETNEUTRALITY_TAG:-latest}
+    image: gitea.bobert.me/anthorob/netneutrality:${NETNEUTRALITY_TAG:-latest}
     container_name: bot
     restart: unless-stopped
     env_file: .env
@@ -32,7 +32,7 @@ services:
       MYSQL_PASSWORD: password
       MYSQL_DATABASE: netneutrality
   ejs-api:
-    image: ghcr.io/kikkia/yt-cipher:master@sha256:8773db905879d79bf61eafcf329c14806b3f7b088b68385d6c6531d7a8720cab
+    image: ghcr.io/kikkia/yt-cipher:master@sha256:4c5ec381ff57336cfc24822d2b526a5ad7cd0171f61065a1bbc87bb736842449
     container_name: ejs_signature_api
     restart: unless-stopped
     networks:

pom.xml

@@ -11,13 +11,20 @@
     <description>Discord bot</description>
     <packaging>jar</packaging>
 
+    <distributionManagement>
+        <repository>
+            <id>gitea</id>
+            <url>https://gitea.bobert.me/api/packages/anthorob/maven</url>
+        </repository>
+    </distributionManagement>
+
     <properties>
         <main.class>me.bobert.netneutrality.NetNeutrality</main.class>
         <java.version>25</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>25</maven.compiler.source>
         <maven.compiler.target>25</maven.compiler.target>
-        <mockito.version>5.20.0</mockito.version>
+        <mockito.version>5.23.0</mockito.version>
     </properties>
 
     <build>
@@ -42,7 +49,7 @@
             <plugin>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-maven-plugin</artifactId>
-                <version>11.14.1</version>
+                <version>11.20.3</version>
                 <configuration>
                     <url>${env.FLYWAY_URL}</url>
                     <user>${env.FLYWAY_USER}</user>
@@ -52,7 +59,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <propertiesEncoding>UTF-8</propertiesEncoding>
                 </configuration>
@@ -73,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -119,20 +126,6 @@
                     <outputFormat>xml</outputFormat>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>de.chkal.maven</groupId>
-                <artifactId>gitlab-code-quality-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -150,7 +143,7 @@
         <repository>
             <id>arbjergDev-releases</id>
             <name>Lavalink Repository</name>
-            <url>https://maven.lavalink.dev/releases</url>
+            <url>https://maven.lavalink.dev/snapshots</url>
         </repository>
     </repositories>
 
@@ -158,7 +151,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>6.3.1</version>
+            <version>6.4.1</version>
         </dependency>
         <dependency>
             <groupId>dev.arbjerg</groupId>
@@ -168,33 +161,33 @@
         <dependency>
             <groupId>dev.lavalink.youtube</groupId>
             <artifactId>v2</artifactId>
-            <version>1.18.0</version>
+            <version>f45bbb7aebfcbc1c553769e04af6cd43afa8b7c3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-api</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-linux-x86-64</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-win-x86-64</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
         <dependency>
             <groupId>club.minnced</groupId>
             <artifactId>jdave-native-darwin</artifactId>
-            <version>0.1.7</version>
+            <version>0.1.8</version>
         </dependency>
 
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-jvm</artifactId>
-            <version>5.3.0</version>
+            <version>5.3.2</version>
         </dependency>
 
         <dependency>
@@ -210,24 +203,24 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <version>9.5.0</version>
+            <version>9.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>11.14.1</version>
+            <version>11.20.3</version>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-mysql</artifactId>
-            <version>11.14.1</version>
+            <version>11.20.3</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry</artifactId>
-            <version>8.25.0</version>
+            <version>8.41.0</version>
         </dependency>
         <dependency>
             <groupId>org.gitlab4j</groupId>
@@ -238,7 +231,7 @@
         <dependency>
             <groupId>net.fellbaum</groupId>
             <artifactId>jemoji</artifactId>
-            <version>1.7.5</version>
+            <version>1.7.6</version>
         </dependency>
 
         <dependency>
@@ -249,7 +242,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
         </dependency>
 
         <dependency>
@@ -261,34 +254,34 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.25.2</version>
+            <version>2.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.25.2</version>
+            <version>2.26.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>2.25.2</version>
+            <version>2.26.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.19.0</version>
+            <version>3.21.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.21.0</version>
+            <version>2.22.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>6.0.1</version>
+            <version>6.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

renovate.json

@@ -6,12 +6,6 @@
     "group:flyway"
   ],
   "packageRules": [
-    {
-      "matchPackageNames": [
-        "quay.io/buildah/stable"
-      ],
-      "enabled": false
-    },
     {
       "matchPackageNames": [
         "mariadb"
@@ -19,18 +13,51 @@
       "automerge": false,
       "dependencyDashboardApproval": true
     },
+    {
+      "matchManagers": ["maven"],
+      "extends": ["schedule:monthly"]
+    },
+    {
+      "groupName": "maven plugins",
+      "matchManagers": ["maven"],
+      "matchDepTypes": ["plugin"],
+      "extends": ["schedule:weekly"]
+    },
     {
       "groupName": "hibernate orm",
       "matchPackageNames": [
         "org.hibernate.orm:**"
-      ]
+      ],
+      "extends": ["schedule:monthly"]
     },
     {
       "groupName": "apache commons",
       "matchPackageNames": [
         "commons-**",
         "org.apache.commons:**"
-      ]
+      ],
+      "extends": ["schedule:monthly"]
+    },
+    {
+      "matchManagers": ["maven"],
+      "matchDepTypes": ["dependency", "parentPom"],
+      "matchPackageNames": [
+        "net.dv8tion:JDA",
+        "dev.arbjerg:lavaplayer",
+        "dev.lavalink.youtube:**",
+        "club.minnced:jdave-*"
+      ],
+      "schedule": ["at any time"]
+    },
+    {
+      "groupName": "github actions (minor/patch)",
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch", "digest"]
+    },
+    {
+      "groupName": "github actions (major)",
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["major"]
     }
   ]
 }