Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions gax-java/gax/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<include>com/google/api/gax/rpc/testing/**</include>
<include>com/google/api/gax/rpc/mtls/**</include>
<include>com/google/api/gax/util/**</include>
<include>**/native-image.properties</include>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change required? If yes, why #3674 didn't include it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was meant to be included in #3674, but I did not push such change.
This change allows the native-image.properties resource file to be included in the testlib jar.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the changes we made to test/resources/META-INF/native-image/com.google.api/gax/native-image.properties in #3674 going to work in handwritten libraries without being included in the testjar?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, they wouldn't work without this <include> entry. Luckily there has not been a release since #3674 was merged, so next release will include that PR and this one (if merged)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SG, that's what I was suspecting, thanks for confirming!

</includes>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Args = --enable-url-protocols=https,http \
com.google.api.gax.core.GaxProperties,\
com.google.common.base.Platform,\
com.google.common.base.Platform$JdkPatternCompiler,\
com.google.common.collect.ImmutableMapEntry,\
com.google.common.collect.RegularImmutableList,\
com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\
com.google.common.collect.SingletonImmutableBiMap,\
com.google.protobuf.RuntimeVersion,\
com.google.protobuf.RuntimeVersion$RuntimeDomain \
--features=com.google.api.gax.nativeimage.OpenCensusFeature,\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ Args=--initialize-at-build-time=java.lang.annotation.Annotation,\
org.junit.runner.RunWith,\
org.junit.runners.model.FrameworkField,\
org.junit.validator.AnnotationValidator,\
org.junit.vintage.engine.discovery.FilterableIgnoringRunnerDecorator
org.junit.vintage.engine.discovery.FilterableIgnoringRunnerDecorator,\
org.junit.vintage.engine.discovery.IgnoringRunnerDecorator
Loading