fix for native builds

openepcis · Jun 19, 2024 · 6759dab · 6759dab
1 parent 7e782d9
commit 6759dab
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 358 deletions.
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -378,22 +378,24 @@ jobs:
           docker manifest push ghcr.io/openepcis/testdata-generator-native:latest;
 
   build-quarkus-native-executable:
-    if: false
     name: "Build Quarkus Service Native Executable"
     needs: [build-jar-job, build-vue-js-job]
 
     strategy:
       matrix:
-        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', 'macos-latest', 'windows-latest']
+        os: ['ubuntu-latest', 'ubuntu-22.04-arm64', 'macos-13', 'macos-latest', 'windows-latest']
         include:
           - os: 'ubuntu-latest'
             label: 'linux-amd64'
             exe: ""
           - os: 'ubuntu-22.04-arm64'
             label: 'linux-arm64'
             exe: ""
+          - os: 'macos-13'
+            label: 'mac-x64'
+            exe: ""
           - os: 'macos-latest'
-            label: 'mac'
+            label: 'mac-arm'
             exe: ""
           - os: 'windows-latest'
             label: 'windows'

diff --git a/pom.xml b/pom.xml
@@ -128,6 +128,11 @@
                 <artifactId>openepcis-document-converter</artifactId>
                 <version>${project.parent.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.openepcis.quarkus</groupId>
+                <artifactId>quarkus-openepcis-model</artifactId>
+                <version>${project.parent.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.openepcis.quarkus</groupId>
                 <artifactId>quarkus-document-converter</artifactId>

diff --git a/testdata-generator-quarkus-rest-app/pom.xml b/testdata-generator-quarkus-rest-app/pom.xml
@@ -198,8 +198,8 @@
             <artifactId>testdata-generator-rest-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.openepcis</groupId>
-            <artifactId>converter-service-rest</artifactId>
+            <groupId>io.openepcis.quarkus</groupId>
+            <artifactId>quarkus-openepcis-model</artifactId>
         </dependency>
         <dependency>
             <groupId>io.openepcis.quarkus</groupId>
@@ -303,60 +303,6 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
-        <!-- add for native build -->
-        <dependency>
-            <groupId>org.glassfish.main.persistence</groupId>
-            <artifactId>eclipselink-wrapper</artifactId>
-            <version>7.0.15</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-jaxb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-reactive-oracle-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>eclipselink</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.moxy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>9.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>9.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-tree</artifactId>
-            <version>9.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-util</artifactId>
-            <version>9.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <version>9.6.0</version>
-        </dependency>
         <dependency>
             <groupId>jakarta.resource</groupId>
             <artifactId>jakarta.resource-api</artifactId>

diff --git a/testdata-generator-quarkus-rest-app/src/main/resources/application.yml b/testdata-generator-quarkus-rest-app/src/main/resources/application.yml
@@ -13,6 +13,8 @@ quarkus:
         files: ssl/cert.pem
         key-files: ssl/key.pem
 
+  ssl:
+    native: true
 
   container-image:
     group: openepcis
@@ -23,10 +25,10 @@ quarkus:
   locales: en
   default-locale: en-US
   native:
-    #    additional-build-args: "--trace-object-instantiation=java.security.SecureRandom,-H:+UnlockExperimentalVMOptions,--initialize-at-run-time=org.eclipse.persistence.sessions.coordination.DiscoveryManager\\,org.eclipse.persistence.eis.EISLogin\\,org.eclipse.persistence.asm.internal.platform.ow2.SerialVersionUIDAdderImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.ClassReaderImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.TypeImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.LabelImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.ClassWriterImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.AnnotationVisitorImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.FieldVisitorImpl\\,org.eclipse.persistence.asm.internal.platform.ow2.MethodVisitorImpl\\,org.eclipse.persistence.eis.EISConnectionSpec\\,org.eclipse.persistence.eis.EISPlatform\\,org.eclipse.persistence.sessions.coordination.RemoteCommandManager\\,sun.rmi.transport.DGCImpl\\,org.eclipse.persistence.sessions.coordination.jms.JMSPublishingTransportManager\\,org.eclipse.persistence.internal.sessions.coordination.jms.JMSTopicRemoteConnection\\,io.openepcis.epc.converter.common.VersionTransformerProducer\\,org.apache.commons.math3.random.RandomDataGenerator\\,org.eclipse.persistence.sessions.coordination.broadcast.BroadcastTransportManager\\,io.openepcis.testdata.generator.format.RandomValueGenerator,-H:-LocalizationOptimizedMode,-Duser.country=US,-Duser.language=en,-H:IncludeLocales=en,-H:IncludeResourceBundles=jakarta.xml.bind.Messages,-H:ReflectionConfigurationFiles=reflection-config.json,-H:-UnlockExperimentalVMOptions"
-    additional-build-args: "--trace-object-instantiation=java.security.SecureRandom\\,java.rmi.server.ObjID\\,org.eclipse.persistence.internal.sessions.coordination.jms.JMSTopicRemoteConnection,-H:+UnlockExperimentalVMOptions,--initialize-at-build-time=java.rmi.server.ObjID\\,java.security.SecureRandom,--initialize-at-run-time=sun.rmi.transport.DGCImpl\\,org.eclipse.persistence.sessions.coordination.jms.JMSPublishingTransportManager\\,org.eclipse.persistence.internal.sessions.coordination.jms.JMSTopicRemoteConnection\\,io.openepcis.epc.converter.common.VersionTransformerProducer\\,org.apache.commons.math3.random.RandomDataGenerator\\,io.openepcis.testdata.generator.format.RandomValueGenerator,-H:-LocalizationOptimizedMode,-Duser.country=US,-Duser.language=en,-H:IncludeLocales=en,-H:IncludeResourceBundles=jakarta.xml.bind.Messages,-H:ReflectionConfigurationFiles=reflection-config.json,-H:-UnlockExperimentalVMOptions"
+    additional-build-args: "--initialize-at-run-time=io.openepcis.testdata.generator.format.RandomValueGenerator"
     resources:
-      includes: ssl/**,static/**,static-web/**,jakarta/**/*.properties,**/jaxb.properties,META-INF/services/.*,META-INF/.*.kotlin_module$
+      includes: "ssl/*"
+
   banner:
     path: "openepcis-banner.txt"
   package:

diff --git a/testdata-generator-quarkus-rest-app/src/main/resources/openepcis-banner.txt b/testdata-generator-quarkus-rest-app/src/main/resources/openepcis-banner.txt
@@ -1,8 +1,17 @@
-   ___                    ___  ___   ___  ___  ___
-  / _ \  _ __  ___  _ _  | __|| _ \ / __||_ _|/ __|
- | (_) || '_ \/ -_)| ' \ | _| |  _/| (__  | | \__ \
-  \___/ | .__/\___||_||_||___||_|   \___||___||___/
-  _____ |_|      _     ___         _            ___                             _
- |_   _|___  ___| |_  |   \  __ _ | |_  __ _   / __| ___  _ _   ___  _ _  __ _ | |_  ___  _ _
-   | | / -_)(_-<|  _| | |) |/ _` ||  _|/ _` | | (_ |/ -_)| ' \ / -_)| '_|/ _` ||  _|/ _ \| '_|
-   |_| \___|/__/ \__| |___/ \__,_| \__|\__,_|  \___|\___||_||_|\___||_|  \__,_| \__|\___/|_|
+  ____                   ____ ___   _____ ____ ____
+ / __ \ ___  ___  ___   / __// _ \ / ___//  _// __/
+/ /_/ // _ \/ -_)/ _ \ / _/ / ___// /__ _/ / _\ \
+\____// .__/\__//_//_//___//_/    \___//___//___/
+     /_/
+ ______          __   ___         __
+/_  __/___  ___ / /_ / _ \ ___ _ / /_ ___ _
+ / /  / -_)(_-</ __// // // _ `// __// _ `/
+/_/   \__//___/\__//____/ \_,_/ \__/ \_,_/
+  _____                           __
+ / ___/___  ___  ___  ____ ___ _ / /_ ___   ____
+/ (_ // -_)/ _ \/ -_)/ __// _ `// __// _ \ / __/
+\___/ \__//_//_/\__//_/   \_,_/ \__/ \___//_/
+
+E-Mail: info@openepcis.io
+Web: https://openepcis.io
+GitHub: https://github.com/openepcis/epcis-testdata-generator