From 6de325b0cc23e7feeb954388582931c2b2d154f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 17 Nov 2022 12:47:16 -0800
Subject: [PATCH] Ensure that `org.jetbrains.annotations` is shaded in the
 AutoValue jar.

Also reorder the `<relocation>` configuration entries lexicographically.

Fixes https://github.com/google/auto/issues/1389.

RELNOTES=Two annotations from `org.jetbrains.annotations` were accidentally included unshaded in the AutoValue jar. That has been fixed.
PiperOrigin-RevId: 489282871
---
 value/processor/pom.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/value/processor/pom.xml b/value/processor/pom.xml
index 23dc287510..c98440daed 100644
--- a/value/processor/pom.xml
+++ b/value/processor/pom.xml
@@ -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>
@@ -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>
@@ -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>