diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
index 1105a096db..0c602f3818 100644
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@@ -73,8 +73,6 @@ jobs:
protobuf-bom:
name: Protobuf Maven BOM
runs-on: ubuntu-latest
- # TODO Re-enable this once it works
- if: false
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v2
diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
index e22e66e6d2..fc9523676b 100644
--- a/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -415,7 +415,11 @@ public final class Descriptors {
if (strings.length == 1) {
return strings[0].getBytes(Internal.ISO_8859_1);
}
- return String.join("", strings).getBytes(Internal.ISO_8859_1);
+ StringBuilder descriptorData = new StringBuilder();
+ for (String part : strings) {
+ descriptorData.append(part);
+ }
+ return descriptorData.toString().getBytes(Internal.ISO_8859_1);
}
private static FileDescriptor[] findDescriptors(
diff --git a/java/pom.xml b/java/pom.xml
index 4aeddb0b7b..2c017a3f08 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -112,8 +112,8 @@
maven-compiler-plugin
3.6.1
- 1.7
- 1.7
+ 1.8
+ 1.8