No SNAPSHOT

Author: trask

.github/unsafe/build-custom-armeria.sh

@@ -3,29 +3,25 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 WORK_DIR="$(mktemp -d)"
-CUSTOM_VERSION="1.33.4-SNAPSHOT"
-ORIGINAL_VERSION="1.33.3"
+VERSION="1.33.3"
 
 echo "Building armeria-core with UNSAFE disabled..."
 
 cd "${WORK_DIR}"
 
 # Clone Armeria repository
-git clone --depth 1 --branch "armeria-${ORIGINAL_VERSION}" https://github.com/line/armeria.git
+git clone --depth 1 --branch "armeria-${VERSION}" https://github.com/line/armeria.git
 
 cd armeria
 
 # Apply patch to remove unsafe access
 git apply "${SCRIPT_DIR}/unsafe.patch"
 
-# Update version to snapshot version
-sed -i "s/version=${ORIGINAL_VERSION}/version=${CUSTOM_VERSION}/" gradle.properties
-
 # Build the core module
 ./gradlew :core:jar -x javadoc -x :docs-client:nodeSetup -x :docs-client:npmSetup -x :docs-client:npmInstall -x :docs-client:eslint -x :docs-client:lint -x :docs-client:buildWeb -x :docs-client:copyWeb
 
 # Find the built JAR
-CORE_JAR="core/build/libs/armeria-${CUSTOM_VERSION}.jar"
+CORE_JAR="core/build/libs/armeria-${VERSION}.jar"
 if [ ! -f "$CORE_JAR" ]; then
     echo "Error: Could not find armeria JAR at $CORE_JAR"
     exit 1
@@ -36,14 +32,7 @@ mvn install:install-file -q \
     -Dfile="$CORE_JAR" \
     -DgroupId=com.linecorp.armeria \
     -DartifactId=armeria \
-    -Dversion="${CUSTOM_VERSION}" \
+    -Dversion="${VERSION}" \
     -Dpackaging=jar
 
-# Update dependencies
-DEPS="${SCRIPT_DIR}/../../dependencyManagement/build.gradle.kts"
-
-# Update only the armeria core artifact version
-sed -i '/com\.linecorp\.armeria:armeria:/d' "${DEPS}"
-sed -i '/^val DEPENDENCIES = listOf(/a\  "com.linecorp.armeria:armeria:'"${CUSTOM_VERSION}"'",' "${DEPS}"
-
-echo "armeria ${CUSTOM_VERSION} built and installed (UNSAFE disabled)."
+echo "armeria ${VERSION} built and installed (UNSAFE disabled)."

.github/unsafe/build-custom-protobuf.sh

@@ -3,20 +3,19 @@ set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 WORK_DIR="$(mktemp -d)"
-CUSTOM_VERSION="4.32.2-SNAPSHOT"
-ORIGINAL_VERSION="4.32.1"
+VERSION="4.32.1"
 
 echo "Building protobuf-java with UNSAFE disabled..."
 
 cd "${WORK_DIR}"
 
 # Download original artifact and extract
-curl -sL -o "protobuf-java-${ORIGINAL_VERSION}.jar" "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/${ORIGINAL_VERSION}/protobuf-java-${ORIGINAL_VERSION}.jar"
+curl -sL -o "protobuf-java-${VERSION}.jar" "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/${VERSION}/protobuf-java-${VERSION}.jar"
 
 # Extract JAR
 mkdir classes
 cd classes
-jar -xf "../protobuf-java-${ORIGINAL_VERSION}.jar"
+jar -xf "../protobuf-java-${VERSION}.jar"
 cd ..
 
 # Clone protobuf repository
@@ -26,26 +25,17 @@ git clone --depth 1 --branch "v32.1" https://github.com/protocolbuffers/protobuf
 sed -i 's/private static final sun\.misc\.Unsafe UNSAFE = getUnsafe();/private static final sun.misc.Unsafe UNSAFE = null;/' protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
 
 # Compile modified classes
-javac -cp protobuf-java-${ORIGINAL_VERSION}.jar -d classes protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
+javac -cp protobuf-java-${VERSION}.jar -d classes protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
 
-# Update version and create new JAR
-sed -i "s/Implementation-Version: ${ORIGINAL_VERSION}/Implementation-Version: ${CUSTOM_VERSION}/" classes/META-INF/MANIFEST.MF
-find classes/META-INF -name "pom.properties" -exec sed -i "s/version=${ORIGINAL_VERSION}/version=${CUSTOM_VERSION}/" {} \;
-jar -cf "protobuf-java-${CUSTOM_VERSION}.jar" -C classes .
+# Create new JAR with modified classes
+jar -cf "protobuf-java-${VERSION}.jar" -C classes .
 
 # Install to Maven local repository
 mvn install:install-file -q \
-    -Dfile="protobuf-java-${CUSTOM_VERSION}.jar" \
+    -Dfile="protobuf-java-${VERSION}.jar" \
     -DgroupId=com.google.protobuf \
     -DartifactId=protobuf-java \
-    -Dversion="${CUSTOM_VERSION}" \
+    -Dversion="${VERSION}" \
     -Dpackaging=jar
 
-# Update dependencies
-DEPS="${SCRIPT_DIR}/../../dependencyManagement/build.gradle.kts"
-sed -i '/com\.google\.protobuf:protobuf-bom:/d' "${DEPS}"
-sed -i '/com\.google\.protobuf:protobuf-java/d' "${DEPS}"
-sed -i '/^val DEPENDENCIES = listOf(/a\  "com.google.protobuf:protobuf-java:'"${CUSTOM_VERSION}"'",' "${DEPS}"
-sed -i '/^val DEPENDENCIES = listOf(/a\  "com.google.protobuf:protobuf-java-util:${ORIGINAL_VERSION}",' "${DEPS}"
-
-echo "protobuf-java ${CUSTOM_VERSION} built and installed (UNSAFE disabled)."
+echo "protobuf-java ${VERSION} built and installed (UNSAFE disabled)."

.github/unsafe/prioritize-maven-local.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SETTINGS_FILE="${SCRIPT_DIR}/../../settings.gradle.kts"
+
+echo "Prioritizing Maven local repository..."
+
+# Move mavenLocal() before mavenCentral() in the repositories block
+sed -i '/repositories {/,/}/ {
+  /mavenCentral()/d
+  /mavenLocal()/d
+  /repositories {/a\    mavenLocal()
+  /repositories {/a\    mavenCentral()
+}' "${SETTINGS_FILE}"
+
+echo "Maven local repository prioritized over Maven Central."

.github/workflows/unsafe.yml

@@ -45,6 +45,9 @@ jobs:
       - name: Build custom armeria without unsafe
         run: ./.github/unsafe/build-custom-armeria.sh
 
+      - name: Prioritize Maven local repository
+        run: ./.github/unsafe/prioritize-maven-local.sh
+
       - name: Build and test
         run: >
             ./gradlew build