From 6759dab04e735971064b40a2968d6e3b5e84c038 Mon Sep 17 00:00:00 2001 From: Sven Boeckelmann Date: Thu, 20 Jun 2024 01:48:57 +0200 Subject: [PATCH] fix for native builds --- .github/workflows/maven-release.yml | 8 +- pom.xml | 5 + testdata-generator-quarkus-rest-app/pom.xml | 58 +--- .../src/main/resources/application.yml | 8 +- .../src/main/resources/openepcis-banner.txt | 25 +- .../src/main/resources/reflection-config.json | 288 ------------------ 6 files changed, 34 insertions(+), 358 deletions(-) delete mode 100644 testdata-generator-quarkus-rest-app/src/main/resources/reflection-config.json diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 6447ce0..3270efa 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -378,13 +378,12 @@ 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' @@ -392,8 +391,11 @@ jobs: - 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 index 14fcc97..a358635 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,11 @@ openepcis-document-converter ${project.parent.version} + + io.openepcis.quarkus + quarkus-openepcis-model + ${project.parent.version} + io.openepcis.quarkus quarkus-document-converter diff --git a/testdata-generator-quarkus-rest-app/pom.xml b/testdata-generator-quarkus-rest-app/pom.xml index 489ec86..94e4c0f 100644 --- a/testdata-generator-quarkus-rest-app/pom.xml +++ b/testdata-generator-quarkus-rest-app/pom.xml @@ -198,8 +198,8 @@ testdata-generator-rest-api - io.openepcis - converter-service-rest + io.openepcis.quarkus + quarkus-openepcis-model io.openepcis.quarkus @@ -303,60 +303,6 @@ jakarta.xml.bind jakarta.xml.bind-api - - - org.glassfish.main.persistence - eclipselink-wrapper - 7.0.15 - pom - - - - io.quarkus - quarkus-jaxb - - - io.quarkus - quarkus-reactive-oracle-client - - - org.eclipse.persistence - eclipselink - - - org.eclipse.persistence - org.eclipse.persistence.moxy - - - org.eclipse.persistence - org.eclipse.persistence.core - - - - org.ow2.asm - asm - 9.6 - - - org.ow2.asm - asm-commons - 9.6 - - - org.ow2.asm - asm-tree - 9.6 - - - org.ow2.asm - asm-util - 9.6 - - - org.eclipse.persistence - org.eclipse.persistence.asm - 9.6.0 - jakarta.resource jakarta.resource-api diff --git a/testdata-generator-quarkus-rest-app/src/main/resources/application.yml b/testdata-generator-quarkus-rest-app/src/main/resources/application.yml index 66c6a19..a4f8879 100644 --- 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 index 7255f38..ee61f0e 100644 --- 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 @@ - ___ ___ ___ ___ ___ ___ - / _ \ _ __ ___ _ _ | __|| _ \ / __||_ _|/ __| - | (_) || '_ \/ -_)| ' \ | _| | _/| (__ | | \__ \ - \___/ | .__/\___||_||_||___||_| \___||___||___/ - _____ |_| _ ___ _ ___ _ - |_ _|___ ___| |_ | \ __ _ | |_ __ _ / __| ___ _ _ ___ _ _ __ _ | |_ ___ _ _ - | | / -_)(_-<| _| | |) |/ _` || _|/ _` | | (_ |/ -_)| ' \ / -_)| '_|/ _` || _|/ _ \| '_| - |_| \___|/__/ \__| |___/ \__,_| \__|\__,_| \___|\___||_||_|\___||_| \__,_| \__|\___/|_| + ____ ____ ___ _____ ____ ____ + / __ \ ___ ___ ___ / __// _ \ / ___// _// __/ +/ /_/ // _ \/ -_)/ _ \ / _/ / ___// /__ _/ / _\ \ +\____// .__/\__//_//_//___//_/ \___//___//___/ + /_/ + ______ __ ___ __ +/_ __/___ ___ / /_ / _ \ ___ _ / /_ ___ _ + / / / -_)(_-