revert

PQILabs · May 19, 2024 · 8f88c53 · 8f88c53
1 parent a6d5252
commit 8f88c53
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,21 +69,18 @@ jobs:
         run: |
           export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:/usr/local/lib"
           mvn package -P macosx
-        continue-on-error: true
 
       - if: matrix.os == 'ubuntu-latest'
         name: Resolve all maven project dependencies and build liboqs-java for Linux
         run: |
           export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
           mvn package -P linux
-        continue-on-error: true
 
       - if: matrix.os == 'windows-latest'
         name: Resolve all maven project dependencies and build liboqs-java for Windows
         run: |
           $env:PATH = $env:PATH + ";" + "C:/Program Files (x86)/liboqs/bin/"
           mvn package -P windows
-        continue-on-error: true
 
       - name: Compile KEM, Signatures and Rand examples
         run: |

diff --git a/pom.xml b/pom.xml
@@ -96,14 +96,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>2.22.0</version>
                 <configuration>
                     <argLine>-Xss10M -Djava.library.path=${basedir}/src/main/resources/</argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -166,6 +166,17 @@
                         <linkerEndOption>-loqs</linkerEndOption>
                     </linkerEndOptions>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-shared-oqs-library</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>initialize</goal>
+                            <goal>compile</goal>
+                            <goal>link</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -190,4 +201,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>