Skip to content

Commit e470317

Browse files
committed
Simplify graalvm config for logback and log4j modules.
1 parent 1d227da commit e470317

3 files changed

Lines changed: 23 additions & 22 deletions

File tree

  • powertools-common
  • powertools-logging

powertools-common/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
<artifactId>maven-surefire-plugin</artifactId>
105105
<version>3.5.3</version>
106106
<configuration>
107-
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
107+
<argLine>
108+
-Dorg.graalvm.nativeimage.imagecode=agent
108109
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-common,experimental-class-define-support
109110
--add-opens java.base/java.util=ALL-UNNAMED
110111
--add-opens java.base/java.lang=ALL-UNNAMED

powertools-logging/powertools-logging-log4j/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@
109109
<artifactId>maven-surefire-plugin</artifactId>
110110
<version>3.5.3</version>
111111
<configuration>
112-
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
112+
<argLine>
113+
-Dorg.graalvm.nativeimage.imagecode=agent
113114
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-log4j,experimental-class-define-support
114115
--add-opens java.base/java.util=ALL-UNNAMED
115116
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -126,7 +127,7 @@
126127
<plugin>
127128
<groupId>org.graalvm.buildtools</groupId>
128129
<artifactId>native-maven-plugin</artifactId>
129-
<version>0.11.0</version> <!-- or newer version -->
130+
<version>0.11.0</version>
130131
<extensions>true</extensions>
131132
<executions>
132133
<execution>
@@ -140,18 +141,17 @@
140141
<configuration>
141142
<imageName>powertools-logging-log4j</imageName>
142143
<buildArgs>
143-
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
144-
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
145-
<buildArg>--no-fallback</buildArg>
146-
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
147-
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
148-
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
149-
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
150-
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
151-
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
152144
<buildArg>
153145
--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier$1
154146
</buildArg>
147+
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
148+
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
149+
<buildArg>--no-fallback</buildArg>
150+
<buildArg>--verbose</buildArg>
151+
<buildArg>--native-image-info</buildArg>
152+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
153+
<buildArg>-H:Log=registerResource:5</buildArg>
154+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
155155
</buildArgs>
156156
</configuration>
157157
</plugin>

powertools-logging/powertools-logging-logback/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797
<artifactId>maven-surefire-plugin</artifactId>
9898
<version>3.5.3</version>
9999
<configuration>
100-
<argLine>-Dorg.graalvm.nativeimage.imagecode=agent
100+
<argLine>
101+
-Dorg.graalvm.nativeimage.imagecode=agent
101102
-agentlib:native-image-agent=config-output-dir=src/main/resources/META-INF/native-image/software.amazon.lambda/powertools-logging-logback,experimental-class-define-support
102103
--add-opens java.base/java.util=ALL-UNNAMED
103104
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -128,18 +129,17 @@
128129
<configuration>
129130
<imageName>powertools-logging-logback</imageName>
130131
<buildArgs>
131-
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
132-
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
133-
<buildArg>--no-fallback</buildArg>
134-
<buildArg>-Dorg.graalvm.nativeimage.imagecode=agent</buildArg>
135-
<buildArg>--initialize-at-build-time=org.slf4j.simple.SimpleLogger</buildArg>
136-
<buildArg>--initialize-at-build-time=org.slf4j.LoggerFactory</buildArg>
137-
<buildArg>--initialize-at-build-time=org.junit.Ignore</buildArg>
138-
<buildArg>--initialize-at-build-time=java.lang.annotation.Annotation</buildArg>
139-
<buildArg>--initialize-at-build-time=org.junit.runners.model.FrameworkField</buildArg>
140132
<buildArg>
141133
--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier$1
142134
</buildArg>
135+
<buildArg>--add-opens java.base/java.util=ALL-UNNAMED</buildArg>
136+
<buildArg>--add-opens java.base/java.lang=ALL-UNNAMED</buildArg>
137+
<buildArg>--no-fallback</buildArg>
138+
<buildArg>--verbose</buildArg>
139+
<buildArg>--native-image-info</buildArg>
140+
<buildArg>-H:+UnlockExperimentalVMOptions</buildArg>
141+
<buildArg>-H:Log=registerResource:5</buildArg>
142+
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
143143
</buildArgs>
144144
</configuration>
145145
</plugin>

0 commit comments

Comments
 (0)