Merge 7e58a3717b into d67e50b5b8

Add liquibase group to renovate config

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.2_13-jdk AS build
+FROM eclipse-temurin:21-jdk AS build
 
 WORKDIR /app/
 
@@ -7,7 +7,7 @@ COPY . /app/
 RUN --mount=type=cache,target=/root/.gradle/caches/ \
  ./gradlew shadowJar
 
-FROM eclipse-temurin:21.0.2_13-jre
+FROM eclipse-temurin:21-jre
 
 RUN --mount=type=cache,target=/var/cache/apt/ \
  apt-get update && \

Dockerfile.ci

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.2_13-jre
+FROM eclipse-temurin:21-jre
 
 RUN --mount=type=cache,target=/var/cache/apt/ \
  apt-get update && \

build.gradle

@@ -11,12 +11,12 @@ repositories {
 
 dependencies {
     implementation 'org.apache.commons:commons-lang3:3.14.0'
-    implementation 'org.apache.commons:commons-text:1.11.0'
-    implementation 'commons-io:commons-io:2.16.0'
+    implementation 'org.apache.commons:commons-text:1.12.0'
+    implementation 'commons-io:commons-io:2.16.1'
     implementation 'it.unimi.dsi:fastutil-core:8.5.13'
     implementation 'commons-codec:commons-codec:1.16.1'
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
-    implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:a6039002a5c844e4bb642cf8cdaca7109821adfe'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
+    implementation 'com.github.FireMasterK.NewPipeExtractor:NewPipeExtractor:fcb1d28f5b7c5c2dd74f54b047c4978cc672a66c'
     implementation 'com.github.FireMasterK:nanojson:9f4af3b739cc13f3d0d9d4b758bbe2b2ae7119d7'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0'
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0'
@@ -33,17 +33,17 @@ dependencies {
     implementation 'org.postgresql:postgresql:42.7.3'
     implementation 'org.hibernate:hibernate-core:6.4.1.Final'
     implementation 'org.hibernate:hibernate-hikaricp:6.4.1.Final'
-    implementation 'org.liquibase:liquibase-core:4.26.0'
-    implementation('org.liquibase.ext:liquibase-yugabytedb:4.26.0') { exclude group: 'org.liquibase' }
+    implementation 'org.liquibase:liquibase-core:4.27.0'
+    implementation('org.liquibase.ext:liquibase-yugabytedb:4.27.0') { exclude group: 'org.liquibase' }
     implementation 'com.zaxxer:HikariCP:5.1.0'
-    implementation 'org.springframework.security:spring-security-crypto:6.2.3'
+    implementation 'org.springframework.security:spring-security-crypto:6.2.4'
     implementation 'commons-logging:commons-logging:1.3.1'
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
     implementation 'com.squareup.okhttp3:okhttp'
     implementation 'com.squareup.okhttp3:okhttp-brotli'
-    implementation 'io.sentry:sentry:7.6.0'
+    implementation 'io.sentry:sentry:7.8.0'
     implementation 'rocks.kavin:reqwest4j:1.0.14'
-    implementation 'io.minio:minio:8.5.9'
+    implementation 'io.minio:minio:8.5.10'
     compileOnly 'org.projectlombok:lombok:1.18.32'
     annotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
@@ -60,7 +60,10 @@ jar {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 group = 'me.kavin.piped'
 version = '1.0'
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21

renovate.json

@@ -20,6 +20,12 @@
       ],
       "groupName": "jackson"
     },
+    {
+      "matchPackagePrefixes": [
+        "org.liquibase"
+      ],
+      "groupName": "liquibase"
+    },
     {
       "matchPackagePrefixes": [
         "com.github.firemasterk."

testing/api-test.sh

@@ -145,7 +145,10 @@ curl "${CURLOPTS[@]}" $HOST/user/playlists/clear -X POST -H "Content-Type: appli
 curl "${CURLOPTS[@]}" $HOST/user/playlists/delete -X POST -H "Content-Type: application/json" -H "Authorization: $AUTH_TOKEN" -d "$(jq -n --compact-output --arg playlistId "$PLAYLIST_ID" '{"playlistId": $playlistId}')" || exit 1
 
 # Import Playlist Test
-curl "${CURLOPTS[@]}" $HOST/import/playlist -X POST -H "Content-Type: application/json" -H "Authorization: $AUTH_TOKEN" -d "$(jq -n --compact-output --arg playlistId "PLQSoWXSpjA3-egtFq45DcUydZ885W7MTT" '{"playlistId": $playlistId}')" || exit 1
+IMPORTED_PLAYLIST_ID=$(curl -s -o - -f $HOST/import/playlist -X POST -H "Content-Type: application/json" -H "Authorization: $AUTH_TOKEN" -d "$(jq -n --compact-output --arg playlistId "PLQSoWXSpjA3-egtFq45DcUydZ885W7MTT" '{"playlistId": $playlistId}')" | jq -r .playlistId || exit 1)
+
+# Remove first video from playlist
+curl "${CURLOPTS[@]}" $HOST/user/playlists/remove -X POST -H "Content-Type: application/json" -H "Authorization: $AUTH_TOKEN" -d "$(jq -n --compact-output --arg index "0" --arg playlistId "$IMPORTED_PLAYLIST_ID" '{"index": $index, "playlistId": $playlistId}')" || exit 1
 
 # Delete User Test
 curl "${CURLOPTS[@]}" $HOST/user/delete -X POST -H "Content-Type: application/json" -H "Authorization: $AUTH_TOKEN" -d "$(jq -n --compact-output --arg password "$PASS" '{"password": $password}')" || exit 1