JDK 17 builds (#165)

* JDK 17 builds * Fix bad unicode
sakaicontrib · Dec 12, 2024 · eb6c42b · eb6c42b
1 parent 9d2ae8c
commit eb6c42b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,16 +7,26 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v2
-      - name: JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/checkout@v4
+      - name: JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
-          architecture: x64
+          java-version: 17
+          distribution: temurin
+          cache: maven
+      - name: Search for bad unicode translations
+        run: |
+          find . -name \*.properties -exec grep '\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]' {} \; &> grep.txt
+          find . -name \*.properties -exec grep '\\u[0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F][0-9a-fA-F]' {} \; &>> grep.txt
+          find . -name \*.properties -exec grep '\\u[0-9a-fA-F][^0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]' {} \; &>> grep.txt
+          find . -name \*.properties -exec grep '\\u[^0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]' {} \; &>> grep.txt
+          if [ -s grep.txt ]; then
+            exit 1
+          fi
       - name: Build with Maven
         env:
           MAVEN_OPTS: -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true
-        run: mvn clean install -Psnapshots -V -B
+        run: mvn --show-version --batch-mode clean install -Psnapshots -V test
diff --git a/...i-evaluation-tool/src/java/org/sakaiproject/evaluation/tool/bundle/messages_ru.properties b/...i-evaluation-tool/src/java/org/sakaiproject/evaluation/tool/bundle/messages_ru.properties
@@ -324,7 +324,6 @@ evalsettings.extra.category.header=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0
 evalsettings.extra.category.instructions=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b \u0434\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0445\u043e\u0436\u0438\u0435 \u043e\u043f\u0440\u043e\u0441\u044b.
 evalsettings.extra.eval.term.id.header=\u0421\u0435\u043C\u0435\u0441\u0442\u0440 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440
 evalsettings.extra.eval.term.id.instructions=\u0421\u0435\u043C\u0435\u0441\u0442\u0440 \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F \u0434\u043B\u044F \u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u044F.
-evalsettings.invalid.eval.category=\u041E\u0446\u0435\u043D\u043A\u0438 \u043A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u0442 \u043D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u044B\u0435 \u0441\u0438\u043C\u0432\u043E\u043B\u044B. \u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0441\u0438\u043C\u0432\u043E\u043B\u043E\u0432 \u0432\u043A\u043B\u044E\u0447\u0430\u0442\u044C \u0430\u043B\u0444\u0430\u0432\u0438\u0442\u043D\u043E\u02D\u0446\u0438\u0444\u0440\u043E\u0432\u044B\u0445 \u0441\u0438\u043C\u0432\u043E\u043B\u043E\u0432 \u0438 \u043B\u044E\u0431\u043E\u0439 \u0438\u0437 \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445: ()+*.-_=,:;!~@%
 evalsettings.updated.message=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043e\u043f\u0440\u043e\u0441\u0430 {0} \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u044b
 evalsettings.invalid.dates=\u041d\u0435\u0432\u0435\u0440\u043d\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u0434\u0430\u0442\u044b \u044d\u0442\u043e\u0433\u043e \u043e\u043f\u0440\u043e\u0441\u0430\: \u0434\u0430\u0442\u0430 \u043d\u0430\u0447\u0430\u043b\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u043f\u0440\u0435\u0434\u0448\u0435\u0441\u0442\u0432\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0442\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f