Skip to content

Commit

Permalink
Ensure that org.jetbrains.annotations is shaded in the AutoValue jar.
Browse files Browse the repository at this point in the history
Also reorder the `<relocation>` configuration entries lexicographically.

Fixes google#1389.

RELNOTES=Two annotations from `org.jetbrains.annotations` were accidentally included unshaded in the AutoValue jar. That has been fixed.
PiperOrigin-RevId: 489282871
  • Loading branch information
eamonnmcmanus authored and Google Java Core Libraries committed Nov 17, 2022
1 parent 61967ec commit 6de325b
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions value/processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,6 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
<shadedPattern>autovalue.shaded.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>autovalue.shaded.com.google</shadedPattern>
Expand All @@ -252,6 +248,14 @@
<pattern>com.squareup.javapoet</pattern>
<shadedPattern>autovalue.shaded.com.squareup.javapoet</shadedPattern>
</relocation>
<relocation>
<pattern>kotlin</pattern>
<shadedPattern>autovalue.shaded.kotlin</shadedPattern>
</relocation>
<relocation>
<pattern>kotlinx</pattern>
<shadedPattern>autovalue.shaded.kotlinx</shadedPattern>
</relocation>
<relocation>
<pattern>net.ltgt.gradle.incap</pattern>
<shadedPattern>autovalue.shaded.net.ltgt.gradle.incap</shadedPattern>
Expand All @@ -261,12 +265,12 @@
<shadedPattern>autovalue.shaded.org.checkerframework</shadedPattern>
</relocation>
<relocation>
<pattern>kotlin</pattern>
<shadedPattern>autovalue.shaded.kotlin</shadedPattern>
<pattern>org.jetbrains</pattern>
<shadedPattern>autovalue.shaded.org.jetbrains</shadedPattern>
</relocation>
<relocation>
<pattern>kotlinx</pattern>
<shadedPattern>autovalue.shaded.kotlinx</shadedPattern>
<pattern>org.objectweb</pattern>
<shadedPattern>autovalue.shaded.org.objectweb</shadedPattern>
</relocation>
</relocations>
</configuration>
Expand Down

0 comments on commit 6de325b

Please sign in to comment.