Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extract esmf-native-support module from samm-cli #662

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Extract esmf-native-support module from samm-cli #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
230c20c
Extract esmf-native-support module from samm-cli
atextor Oct 18, 2024
48a4720
Add missing JNI configuration
atextor Oct 18, 2024
f8686a4
Add substitution for Apache POI class with hard log4j reference
atextor Oct 18, 2024
978e0b8
Update pipelines to new module build setup
atextor Oct 18, 2024
d2b34a5
Fix code style
atextor Oct 18, 2024
26fcf69
Make sun.font.FontConfigManager confg Linux-specific
atextor Oct 18, 2024
5ffbd1c
Configure class for reflection
atextor Oct 18, 2024
c315c88
Make reflection configuration platform dependent
atextor Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/pull-request-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,13 @@ jobs:
export MAVEN_OPTS="-Xmx4096m"
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
cd tools/samm-cli
unset JAVA_TOOL_OPTIONS
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
shell: bash

- name: Build native image
if: matrix.os != 'macos-13'
run: |
export MAVEN_OPTS="-Xmx4096m"
cd tools/samm-cli
mvn -B package -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
shell: bash

- name: Build native image (Mac)
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Setup JDK
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
with:
java-version: '17.0.8'
java-version: '17.0.10'
distribution: 'graalvm'
components: 'native-image,js'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -101,11 +101,8 @@ jobs:
# Actual build of core SDK
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean deploy -Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -DaltDeploymentRepository=local::default::file://nexus-staging -Psign
# Build of CLI
pushd tools/samm-cli
unset JAVA_TOOL_OPTIONS
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
popd
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60

# Create .tar.gz of samm-cli
pushd tools/samm-cli/target
Expand Down Expand Up @@ -152,7 +149,7 @@ jobs:
- name: Setup JDK
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
with:
java-version: '17.0.8'
java-version: '17.0.10'
distribution: 'graalvm'
components: 'native-image,js'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -176,9 +173,8 @@ jobs:
# Actual build of core SDK
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
# Build of CLI
cd tools/samm-cli
unset JAVA_TOOL_OPTIONS
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
mvn -B -pl tools/samm-cli clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
shell: bash

- name: Build native executable
Expand Down Expand Up @@ -226,7 +222,7 @@ jobs:
- name: Setup JDK
uses: graalvm/setup-graalvm@2f25c0caae5b220866f732832d5e3e29ff493338 # v1.2.1
with:
java-version: '17.0.8'
java-version: '17.0.10'
distribution: 'graalvm'
components: 'native-image,js'
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -263,10 +259,8 @@ jobs:
# Actual build of core SDK
mvn -B -pl '!org.eclipse.esmf:samm-cli' clean install -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
# Build of CLI
cd tools/samm-cli
unset JAVA_TOOL_OPTIONS
mvn -B clean verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
mvn -B verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
mvn -B -pl tools/samm-cli clean verify -Pnative -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
shell: bash

- name: Upload Windows binary
Expand Down
5 changes: 0 additions & 5 deletions core/esmf-aspect-meta-model-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
<name>ESMF Aspect Meta Model Java</name>
<packaging>jar</packaging>

<properties>
<generated-sources>${project.basedir}/src-gen</generated-sources>
<build-time-sources>${project.basedir}/src-buildtime</build-time-sources>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.esmf</groupId>
Expand Down
172 changes: 172 additions & 0 deletions core/esmf-native-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
~
~ See the AUTHORS file(s) distributed with this work for additional
~ information regarding authorship.
~
~ This Source Code Form is subject to the terms of the Mozilla Public
~ License, v. 2.0. If a copy of the MPL was not distributed with this
~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
~
~ SPDX-License-Identifier: MPL-2.0
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.esmf</groupId>
<artifactId>esmf-sdk-parent</artifactId>
<version>DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>esmf-native-support</artifactId>
<name>ESMF Native Support</name>

<properties>
<skip.maven.shade>false</skip.maven.shade>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.esmf</groupId>
<artifactId>esmf-aspect-model-starter</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<!-- This needs to take place after the customize-resource-config exec-maven-plugin goal runs and before the package phase -->
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
<resources>
<resource>
<directory>${generated-sources}/main/resources/META-INF</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
<arg>--add-exports</arg>
<arg>java.desktop/sun.awt=ALL-UNNAMED</arg>
<arg>--add-exports</arg>
<arg>java.desktop/sun.font=ALL-UNNAMED</arg>
<arg>--add-exports</arg>
<arg>org.graalvm.sdk/org.graalvm.nativeimage.impl=ALL-UNNAMED</arg>
</compilerArgs>
<showWarnings>false</showWarnings>
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>org.eclipse.esmf.substitution,org.eclipse.esmf.buildtime</excludePackageNames>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
<argLine>--add-exports org.graalvm.sdk/org.graalvm.nativeimage.impl=ALL-UNNAMED</argLine>
</configuration>
</plugin>

<!-- Executes build-time-only code -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<!-- Generate admin-shell reflection config -->
<execution>
<id>generate-admin-shell-reflection-config</id>
<phase>process-classes</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<!-- The main class of your build-time scanning code -->
<mainClass>org.eclipse.esmf.buildtime.Aas4jClassSetup</mainClass>
<!-- Pass the directory where to write the properties file -->
<commandlineArgs>${project.build.outputDirectory}</commandlineArgs>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
</configuration>
</execution>
<!-- Execute adjustments of native configs that were generated during the tests -->
<execution>
<id>customize-resource-config</id>
<phase>process-classes</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<!-- The main class of your build-time scanning code -->
<mainClass>org.eclipse.esmf.buildtime.CustomizeGraalVmConfigs</mainClass>
<!-- Pass the native image configs directory as a commandline param -->
<commandlineArgs>${native-config-path}</commandlineArgs>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- Exclude build-time-only code from jar -->
<excludes>
<exclude>org/eclipse/esmf/buildtime/**</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
22 changes: 15 additions & 7 deletions ...lipse/esmf/buildtime/Aas4jClassSetup.java → ...lipse/esmf/buildtime/Aas4jClassSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
import static org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper.MODEL_PACKAGE_NAME;
import static org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper.MODEL_TYPE_SUPERCLASSES;
import static org.eclipse.digitaltwin.aas4j.v3.dataformat.core.internal.util.ReflectionHelper.XML_MIXINS_PACKAGE_NAME;
import static org.eclipse.esmf.nativefeatures.AssetAdministrationShellFeature.ADMINSHELL_PROPERTIES;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -70,14 +70,22 @@ public Aas4jClassSetup() {
config.interfaces = scanAasInterfaces();
config.enums = modelScan.getAllEnums().loadClasses( Enum.class );
config.interfacesWithoutDefaultImplementation = getInterfacesWithoutDefaultImplementation( modelScan );
config.classesInModelPackage = classesInPackage( MODEL_PACKAGE_NAME );
config.classesInDefaultImplementationPackage = classesInPackage( DEFAULT_IMPLEMENTATION_PACKAGE_NAME );
config.classesInJsonMixinsPackage = classesInPackage( JSON_MIXINS_PACKAGE_NAME );
config.classesInXmlMixinsPackage = classesInPackage( XML_MIXINS_PACKAGE_NAME );
}

public static void main( final String[] args ) throws IOException {
final AdminShellConfig config = new Aas4jClassSetup().config;
final Properties p = config.toProperties();
final File out = new File( args[0] );
final FileOutputStream outputStream = new FileOutputStream( out );
p.store( outputStream, null );
try ( final FileOutputStream outputStream = new FileOutputStream( Path.of( args[0] ).resolve( ADMINSHELL_PROPERTIES ).toFile() ) ) {
new Aas4jClassSetup().config.toProperties().store( outputStream, null );
}
}

private Set<Class<?>> classesInPackage( final String packageName ) {
try ( final ScanResult scanResult = new ClassGraph().enableAllInfo().acceptPackages( packageName ).scan() ) {
return new HashSet<>( scanResult.getAllClasses().loadClasses() );
}
}

/**
Expand Down
Loading
Loading