Merge pull request #20 from denismakogon/jdk21

checking java resources during build process
denismakogon · Oct 11, 2023 · f4eaf92 · f4eaf92
2 parents 83f44e8 + 52426e1
commit f4eaf92
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -153,20 +153,28 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: libjudy.so
-          path: build/src/main/resources
+          path: build/src/main/resources/lib
 
       - name: libjudy.dylib
         uses: actions/download-artifact@v3
         with:
           name: libjudy.dylib
-          path: build/src/main/resources
+          path: build/src/main/resources/lib
+
+      - name: Display structure of downloaded files
+        run: ls -R
+        working-directory: build/src/main/resources
 
       - name: jar
         shell: bash
         run: |
           cd build
           make jar
 
+      - name: jar tf
+        run: jar tf ../target/judy*.jar
+        working-directory: build/
+
       - name: 'make release'
         if: github.event_name == 'push'
         uses: marvinpinto/action-automatic-releases@latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,5 +36,5 @@ add_custom_target(
 
 add_custom_target(
     jar
-    COMMAND mvn -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml clean package -Dversion=${JAR_VERSION} -Dsrc.dir=${CMAKE_CURRENT_SOURCE_DIR}/build/src/main/java
+    COMMAND mvn -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml clean package -Dversion=${JAR_VERSION} -Dsrc.dir=${CMAKE_CURRENT_SOURCE_DIR}/build/src
 )
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </licenses>
 
     <properties>
-        <src.dir>build/src/main/java</src.dir>
+        <src.dir>build/src</src.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
@@ -52,6 +52,14 @@
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>3.3.1</version>
+                    <configuration>
+                        <resources>
+                            <resource>
+                                <directory>${basedir}/${src.dir}/main/resources</directory>
+                                <filtering>false</filtering>
+                            </resource>
+                        </resources>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>