-
Notifications
You must be signed in to change notification settings - Fork 896
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Streamline native image config generation / Update native image config
Motivation:
- Generating the native image config currently requires more than one
manual steps not well-documented.
- We didn't update our native image config recently.
Modifications:
- Updated `README.md`
- `nativeImageConfig` task now merges the previously generated config,
so that we don't need to merge it manually.
- Added a new option `-Pscratch` that builds the config from scratch,
which is disabled by default.
- `nativeImageConfig` task now removes the comment patterns in
`resource-config.json` automatically.
- Added a few more filters to remove unnecessary entries in the
generated native image config.
- Updated the native image config
Result:
- Only one manual step left until automating native image config
generation
- Up-to-date native image config- Loading branch information
Showing
10 changed files
with
13,867 additions
and
9,767 deletions.
There are no files selected for viewing
885 changes: 481 additions & 404 deletions
885
core/src/main/resources/META-INF/native-image/com.linecorp.armeria/armeria/jni-config.json
Large diffs are not rendered by default.
Oops, something went wrong.
11 changes: 4 additions & 7 deletions
11
...sources/META-INF/native-image/com.linecorp.armeria/armeria/predefined-classes-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| [ | ||
| { | ||
| "type":"agent-extracted", | ||
| "classes":[ | ||
| ] | ||
| } | ||
| ] | ||
| [ { | ||
| "type" : "agent-extracted", | ||
| "classes" : [ ] | ||
| } ] |
148 changes: 59 additions & 89 deletions
148
core/src/main/resources/META-INF/native-image/com.linecorp.armeria/armeria/proxy-config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,59 @@ | ||
| [ | ||
| { | ||
| "interfaces":["javax.ws.rs.core.HttpHeaders"] | ||
| }, | ||
| { | ||
| "interfaces":["javax.ws.rs.core.Request"] | ||
| }, | ||
| { | ||
| "interfaces":["javax.ws.rs.core.SecurityContext"] | ||
| }, | ||
| { | ||
| "interfaces":["javax.ws.rs.core.UriInfo"] | ||
| }, | ||
| { | ||
| "interfaces":["javax.ws.rs.ext.Providers"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$Executable"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.method.ParameterDescription$ForLoadedParameter$Parameter"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.method.ParameterList$ForLoadedExecutable$Executable"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDefinition$Sort$AnnotatedType"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$ForLoadedType$Dispatcher"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedExecutableExceptionType$Dispatcher"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedExecutableParameterType$Dispatcher"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedMethodReturnType$Dispatcher"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForComponentType$AnnotatedParameterizedType"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeArgument$AnnotatedParameterizedType"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeVariableBoundType$AnnotatedTypeVariable"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeVariableBoundType$OfFormalTypeVariable$FormalTypeVariable"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForWildcardLowerBoundType$AnnotatedWildcardType"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForWildcardUpperBoundType$AnnotatedWildcardType"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.dynamic.loading.ClassInjector$UsingLookup$MethodHandles"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.dynamic.loading.ClassInjector$UsingLookup$MethodHandles$Lookup"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.dynamic.loading.ClassInjector$UsingReflection$System"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.dynamic.loading.ClassInjector$UsingUnsafe$System"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.utility.JavaModule$Module"] | ||
| }, | ||
| { | ||
| "interfaces":["net.bytebuddy.utility.JavaModule$Resolver"] | ||
| }, | ||
| { | ||
| "interfaces":["org.jboss.resteasy.spi.HttpRequest"] | ||
| }, | ||
| { | ||
| "interfaces":["org.jboss.resteasy.spi.ResteasyConfiguration"] | ||
| } | ||
| ] | ||
| [ { | ||
| "interfaces" : [ "javax.ws.rs.core.HttpHeaders" ] | ||
| }, { | ||
| "interfaces" : [ "javax.ws.rs.core.Request" ] | ||
| }, { | ||
| "interfaces" : [ "javax.ws.rs.core.SecurityContext" ] | ||
| }, { | ||
| "interfaces" : [ "javax.ws.rs.core.UriInfo" ] | ||
| }, { | ||
| "interfaces" : [ "javax.ws.rs.ext.Providers" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.method.MethodDescription$InDefinedShape$AbstractBase$Executable" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.method.ParameterDescription$ForLoadedParameter$Parameter" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.method.ParameterList$ForLoadedExecutable$Executable" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDefinition$Sort$AnnotatedType" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$ForLoadedType$Dispatcher" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedExecutableExceptionType$Dispatcher" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedExecutableParameterType$Dispatcher" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedMethodReturnType$Dispatcher" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForComponentType$AnnotatedParameterizedType" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeArgument$AnnotatedParameterizedType" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeVariableBoundType$AnnotatedTypeVariable" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForTypeVariableBoundType$OfFormalTypeVariable$FormalTypeVariable" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForWildcardLowerBoundType$AnnotatedWildcardType" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$ForWildcardUpperBoundType$AnnotatedWildcardType" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.dynamic.loading.ClassInjector$UsingLookup$MethodHandles" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.dynamic.loading.ClassInjector$UsingLookup$MethodHandles$Lookup" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.dynamic.loading.ClassInjector$UsingReflection$System" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.dynamic.loading.ClassInjector$UsingUnsafe$System" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.utility.JavaModule$Module" ] | ||
| }, { | ||
| "interfaces" : [ "net.bytebuddy.utility.JavaModule$Resolver" ] | ||
| }, { | ||
| "interfaces" : [ "org.jboss.resteasy.spi.HttpRequest" ] | ||
| }, { | ||
| "interfaces" : [ "org.jboss.resteasy.spi.ResteasyConfiguration" ] | ||
| } ] |
Oops, something went wrong.