From 804546b75c8a6ceebad2173a7464b0c09a290de8 Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Fri, 22 Nov 2024 21:48:37 +0900
Subject: [PATCH] Update CHANGELOG.md and fix nits

---
 .github/workflows/javacpp.yml |   6 +-
 CHANGELOG.md                  |   2 +
 platform/pom.xml              | 102 +++++++++++++++++-----------------
 src/it/osgi/pom.xml           |  12 ++--
 4 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/javacpp.yml b/.github/workflows/javacpp.yml
index 95b40c3f..b93fcb7d 100644
--- a/.github/workflows/javacpp.yml
+++ b/.github/workflows/javacpp.yml
@@ -41,11 +41,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-riscv64:
+  linux-ppc64le:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-ppc64le:
+  linux-riscv64:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
@@ -81,7 +81,7 @@ jobs:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
 #    needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
-    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-riscv64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
+    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-ppc64le, linux-riscv64, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4682b28..2ac49344 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Add support for `linux-riscv64` with `linux-riscv64.properties` ([pull #781](https://github.com/bytedeco/javacpp/pull/781))
+
 ### November 16, 2024 version 1.5.11
  * Fix `Generator` flakiness caused by calls to `Class.getDeclaredMethods()` ([pull #784](https://github.com/bytedeco/javacpp/pull/784))
  * Add minimal mappings for `std::chrono` from C++11 ([pull #766](https://github.com/bytedeco/javacpp/pull/766))
diff --git a/platform/pom.xml b/platform/pom.xml
index fd1b5e7a..a9d6224f 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -66,8 +66,8 @@
     <javacpp.platform.ios-x86_64>ios-x86_64${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
     <javacpp.platform.linux-armhf>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf>
     <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-    <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+    <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-x86>linux-x86${javacpp.platform.extension}</javacpp.platform.linux-x86>
     <javacpp.platform.linux-x86_64>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
     <javacpp.platform.macosx-arm64>macosx-arm64${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -134,13 +134,13 @@
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-riscv64}</classifier>
+      <classifier>${javacpp.platform.linux-ppc64le}</classifier>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-ppc64le}</classifier>
+      <classifier>${javacpp.platform.linux-riscv64}</classifier>
     </dependency>
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->
@@ -247,7 +247,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-riscv64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
+                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-ppc64le.jar javacpp-linux-riscv64.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -307,8 +307,8 @@
                       requires static org.bytedeco.javacpp.ios.x86_64;
                       requires static org.bytedeco.javacpp.linux.armhf;
                       requires static org.bytedeco.javacpp.linux.arm64;
-                      requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.ppc64le;
+                      requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.x86;
                       requires static org.bytedeco.javacpp.linux.x86_64;
                       requires static org.bytedeco.javacpp.macosx.arm64;
@@ -432,8 +432,8 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -462,8 +462,8 @@
         <javacpp.platform.ios-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -492,8 +492,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -522,8 +522,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -553,8 +553,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -583,8 +583,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -613,8 +613,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -643,8 +643,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -673,8 +673,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -703,8 +703,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -733,8 +733,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -763,8 +763,8 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -793,8 +793,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -823,8 +823,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -835,11 +835,11 @@
     </profile>
 
     <profile>
-      <id>javacpp-platform-linux-riscv64</id>
+      <id>javacpp-platform-linux-ppc64le</id>
       <activation>
         <property>
           <name>javacpp.platform</name>
-          <value>linux-riscv64</value>
+          <value>linux-ppc64le</value>
         </property>
       </activation>
       <properties>
@@ -853,8 +853,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -865,11 +865,11 @@
     </profile>
 
     <profile>
-      <id>javacpp-platform-linux-ppc64le</id>
+      <id>javacpp-platform-linux-riscv64</id>
       <activation>
         <property>
           <name>javacpp.platform</name>
-          <value>linux-ppc64le</value>
+          <value>linux-riscv64</value>
         </property>
       </activation>
       <properties>
@@ -883,8 +883,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
-        <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -913,8 +913,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -943,8 +943,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -973,8 +973,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -1003,8 +1003,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1033,8 +1033,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1063,8 +1063,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1197,26 +1197,26 @@
     </profile>
 
     <profile>
-      <id>javacpp.platform.linux-riscv64-true</id>
+      <id>javacpp.platform.linux-ppc64le-true</id>
       <activation>
         <property>
-          <name>javacpp.platform.linux-riscv64</name>
+          <name>javacpp.platform.linux-ppc64le</name>
         </property>
       </activation>
       <properties>
-        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
       </properties>
     </profile>
 
     <profile>
-      <id>javacpp.platform.linux-ppc64le-true</id>
+      <id>javacpp.platform.linux-riscv64-true</id>
       <activation>
         <property>
-          <name>javacpp.platform.linux-ppc64le</name>
+          <name>javacpp.platform.linux-riscv64</name>
         </property>
       </activation>
       <properties>
-        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
       </properties>
     </profile>
 
@@ -1358,28 +1358,28 @@
     </profile>
 
     <profile>
-      <id>javacpp.platform.custom-linux-riscv64</id>
+      <id>javacpp.platform.custom-linux-ppc64le</id>
       <activation>
         <property>
           <name>javacpp.platform.host</name>
         </property>
-        <os><name>linux</name><arch>riscv64</arch></os>
+        <os><name>linux</name><arch>ppc64le</arch></os>
       </activation>
       <properties>
-        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
       </properties>
     </profile>
 
     <profile>
-      <id>javacpp.platform.custom-linux-ppc64le</id>
+      <id>javacpp.platform.custom-linux-riscv64</id>
       <activation>
         <property>
           <name>javacpp.platform.host</name>
         </property>
-        <os><name>linux</name><arch>ppc64le</arch></os>
+        <os><name>linux</name><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
       </properties>
     </profile>
 
@@ -1589,21 +1589,21 @@
       </properties>
     </profile>
     <profile>
-      <id>riscv64</id>
+      <id>armv8</id>
       <activation>
-        <os><arch>riscv64</arch></os>
+        <os><arch>armv8</arch></os>
       </activation>
       <properties>
-        <os.arch>riscv64</os.arch>
+        <os.arch>arm64</os.arch>
       </properties>
     </profile>
     <profile>
-      <id>armv8</id>
+      <id>riscv64</id>
       <activation>
-        <os><arch>armv8</arch></os>
+        <os><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <os.arch>arm64</os.arch>
+        <os.arch>riscv64</os.arch>
       </properties>
     </profile>
     <profile>
diff --git a/src/it/osgi/pom.xml b/src/it/osgi/pom.xml
index cdf052bc..eee6561d 100644
--- a/src/it/osgi/pom.xml
+++ b/src/it/osgi/pom.xml
@@ -74,21 +74,21 @@
       </properties>
     </profile>
     <profile>
-      <id>riscv64</id>
+      <id>armv8</id>
       <activation>
-        <os><arch>riscv64</arch></os>
+        <os><arch>armv8</arch></os>
       </activation>
       <properties>
-        <os.arch>riscv64</os.arch>
+        <os.arch>arm64</os.arch>
       </properties>
     </profile>
     <profile>
-      <id>armv8</id>
+      <id>riscv64</id>
       <activation>
-        <os><arch>armv8</arch></os>
+        <os><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <os.arch>arm64</os.arch>
+        <os.arch>riscv64</os.arch>
       </properties>
     </profile>
     <profile>