Update eclipse-temurin:25-jre Docker digest to ecdc0ad

fix cache in docker build
add missing distribution management configuration in pom
2026-10-29 21:03:27 +00:00 · 2026-09-06 16:56:08 -04:00 · 2026-09-06 16:48:14 -04:00 · 2026-09-06 16:41:29 -04:00 · 2026-09-06 16:28:29 -04:00 · 2026-09-06 16:25:45 -04:00
8 changed files with 200 additions and 157 deletions
@@ -1,5 +1,5 @@
 .git
-.gitea
+.github
 .idea
 .mvn
 src
@@ -1,124 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "main"
-    tags:
-      - '*'
-  pull_request:
-    branches:
-      - "main"
-
-jobs:
-  package:
-    name: Package
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Set up JDK
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-        with:
-          distribution: 'temurin'
-          java-version: '25'
-
-      - name: Build package
-        run: |
-          chmod +x ./mvnw
-          ./mvnw --batch-mode --update-snapshots verify
-
-      - name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@c6a366c94c3e0affe28c06c8df20a878f24da3cf # v3
-        with:
-          name: junit-reports
-          path: |
-            **/target/*-reports/TEST-*.xml
-          if-no-files-found: ignore
-
-      - name: Upload Maven artifacts
-        uses: actions/upload-artifact@c6a366c94c3e0affe28c06c8df20a878f24da3cf # v3
-        with:
-          name: maven-artifacts
-          path: |
-            target/netneutrality.jar
-            startup.sh
-          if-no-files-found: error
-
-  docker-main:
-    name: Docker Build and Push (main)
-    runs-on: ubuntu-latest
-    needs: package
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@a9bc5e6ef2cb54c177f32aa5726adaa15e7e2d59 # v3
-        with:
-          name: maven-artifacts
-          path: .
-
-      - 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 (main)
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: "${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:main"
-
-  docker-release:
-    name: Docker Build and Push (release)
-    runs-on: ubuntu-latest
-    needs: package
-    if: ${{ startsWith(github.ref, 'refs/tags/') }}
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@a9bc5e6ef2cb54c177f32aa5726adaa15e7e2d59 # v3
-        with:
-          name: maven-artifacts
-          path: .
-
-      - name: Compute release version
-        id: rel
-        shell: bash
-        run: |
-          # Strip leading 'v' if present (e.g., v1.2.3 -> 1.2.3)
-          ver="${GITHUB_REF_NAME#v}"
-          echo "version=$ver" >> "$GITHUB_OUTPUT"
-
-      - 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 (release + latest)
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: |
-            ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:${{ steps.rel.outputs.version }}
-            ${{ secrets.REGISTRY_URL }}/${{ secrets.REGISTRY_USER }}/netneutrality:latest
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:25-jre@sha256:ff82c74a630c08b417502c4c18189e62074edbb28eb1f2d31b799ac138c01058
+FROM eclipse-temurin:25-jre@sha256:ecdc0adb37bde1a281c4d245a3cd535004b1fc8322d560f5b09463b248c81df0

 RUN apt-get update && apt-get install -y --no-install-recommends netcat-openbsd curl && rm -rf /var/lib/apt/lists/*

@@ -32,7 +32,7 @@ services:
      MYSQL_PASSWORD: password
      MYSQL_DATABASE: netneutrality
  ejs-api:
-    image: ghcr.io/kikkia/yt-cipher:master@sha256:4fbb0d94cb4b9d2e5028986853825921d8c30975c0d948391fb9f4c7bf8520f6
+    image: ghcr.io/kikkia/yt-cipher:master@sha256:4c5ec381ff57336cfc24822d2b526a5ad7cd0171f61065a1bbc87bb736842449
    container_name: ejs_signature_api
    restart: unless-stopped
    networks:
@@ -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>
@@ -136,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>

@@ -144,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>
@@ -154,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>
@@ -196,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>
@@ -235,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>
@@ -247,17 +254,17 @@
        <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>
@@ -274,7 +281,7 @@
        <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>
@@ -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"]
    }
  ]
 }
Author	SHA1	Message	Date
renovate-bot	3e372d5fc1	Update eclipse-temurin:25-jre Docker digest to ecdc0ad CI / Package (pull_request) Successful in 40s Details CI / Publish Maven Package (pull_request) Skipped Details CI / Docker Build and Push (pull_request) Skipped Details	2026-10-29 21:03:27 +00:00
anthorob	f4b5ad30b3	fix cache in docker build CI / Package (push) Successful in 38s Details CI / Publish Maven Package (push) Failing after 26s Details CI / Docker Build and Push (push) Successful in 35s Details	2026-09-06 16:56:08 -04:00
anthorob	a4345d30da	add missing distribution management configuration in pom CI / Package (push) Successful in 1m3s Details CI / Publish Maven Package (push) Successful in 26s Details CI / Docker Build and Push (push) Failing after 31s Details	2026-09-06 16:48:14 -04:00
anthorob	d0de70ab3f	Merge pull request 'Use snapshot of youtube-source to fix playback' (#30 ) from remote-pot into main CI / Package (push) Successful in 38s Details CI / Publish Maven Package (push) Failing after 27s Details CI / Docker Build and Push (push) Failing after 46s Details Reviewed-on: #30	2026-09-06 16:41:29 -04:00
anthorob	fdf262969a	update CI workflow CI / Package (pull_request) Successful in 1m30s Details CI / Publish Maven Package (pull_request) Has been skipped Details CI / Docker Build and Push (pull_request) Has been skipped Details	2026-09-06 16:28:29 -04:00
anthorob	fb2835f427	use snapshot for youtube source	2026-09-06 16:25:45 -04:00
anthorob	54a27883d1	Merge pull request 'Update ghcr.io/kikkia/yt-cipher:master Docker digest to 4c5ec38' (#3 ) from renovate/ghcr.io-kikkia-yt-cipher-master into main CI / Package (push) Successful in 45s Details CI / Docker Build and Push (main) (push) Successful in 19s Details CI / Docker Build and Push (release) (push) Has been skipped Details Reviewed-on: #3	2026-08-24 17:27:27 -04:00
anthorob	196f0be044	Merge pull request 'Update dependency dev.lavalink.youtube:v2 to v1.18.2' (#27 ) from renovate/dev.lavalink.youtube-v2-1.x into main CI / Package (push) Successful in 42s Details CI / Docker Build and Push (main) (push) Successful in 19s Details CI / Docker Build and Push (release) (push) Has been skipped Details Reviewed-on: #27	2026-08-24 17:26:03 -04:00
renovate-bot	571713a9ec	Update dependency dev.lavalink.youtube:v2 to v1.18.2 CI / Package (pull_request) Successful in 1m0s Details CI / Docker Build and Push (main) (pull_request) Has been skipped Details CI / Docker Build and Push (release) (pull_request) Has been skipped Details	2026-08-24 21:02:40 +00:00
anthorob	aa587ddf3c	expand GitHub Actions updates to include digest changes CI / Package (push) Successful in 43s Details CI / Docker Build and Push (main) (push) Successful in 19s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-08-24 16:49:38 -04:00
anthorob	f8ebe28cb4	rename .gitea to .github for renovate integration CI / Package (push) Successful in 44s Details CI / Docker Build and Push (main) (push) Successful in 19s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-08-24 16:46:45 -04:00
anthorob	1544cda9d2	update Renovate config for Maven dependency grouping CI / Package (push) Successful in 1m4s Details CI / Docker Build and Push (main) (push) Successful in 3m16s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-08-24 16:39:18 -04:00
renovate-bot	703f503191	Update ghcr.io/kikkia/yt-cipher:master Docker digest to 4c5ec38 CI / Package (pull_request) Successful in 49s Details CI / Docker Build and Push (main) (pull_request) Has been skipped Details CI / Docker Build and Push (release) (pull_request) Has been skipped Details	2026-08-06 06:02:33 +00:00
anthorob	52bb9c026b	group GitHub Actions updates by type CI / Package (push) Successful in 42s Details CI / Docker Build and Push (main) (push) Successful in 18s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-05-13 00:52:01 -04:00
anthorob	ad77cf630e	update Maven dependencies CI / Package (push) Successful in 1m7s Details CI / Docker Build and Push (main) (push) Successful in 41s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-05-12 23:37:18 -04:00
anthorob	62fc2097c2	enable Maven cache in CI workflow CI / Package (push) Successful in 2m0s Details CI / Docker Build and Push (main) (push) Successful in 2m18s Details CI / Docker Build and Push (release) (push) Has been skipped Details	2026-04-01 11:45:00 -04:00