From a04a30ae420224941cf236dd3df1e89fe738cf98 Mon Sep 17 00:00:00 2001
From: svc-excavator-bot <svc-excavator-bot@palantir.com>
Date: Thu, 16 Mar 2023 16:28:45 +0000
Subject: [PATCH 1/2] Excavator:  Upgrades Baseline to the latest version

---
 build.gradle                                  |  2 +-
 .../baseline-class-uniqueness.lock            | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 conjure-java-jersey-server/baseline-class-uniqueness.lock

diff --git a/build.gradle b/build.gradle
index cc0ba0309..9b189c9dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.28.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.188.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.0.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
diff --git a/conjure-java-jersey-server/baseline-class-uniqueness.lock b/conjure-java-jersey-server/baseline-class-uniqueness.lock
new file mode 100644
index 000000000..b7a73831e
--- /dev/null
+++ b/conjure-java-jersey-server/baseline-class-uniqueness.lock
@@ -0,0 +1,50 @@
+# Danger! Multiple jars contain identically named classes. This may cause different behaviour depending on classpath ordering.
+# Run ./gradlew checkClassUniqueness --write-locks to update this file
+
+## runtimeClasspath
+[javax.el:javax.el-api, org.glassfish:jakarta.el]
+  - javax.el.ArrayELResolver
+  - javax.el.BeanELResolver
+  - javax.el.BeanELResolver$1
+  - javax.el.BeanELResolver$BPSoftReference
+  - javax.el.BeanELResolver$BeanProperties
+  - javax.el.BeanELResolver$BeanProperty
+  - javax.el.BeanELResolver$SoftConcurrentHashMap
+  - javax.el.BeanNameELResolver
+  - javax.el.BeanNameResolver
+  - javax.el.CompositeELResolver
+  - javax.el.CompositeELResolver$CompositeIterator
+  - javax.el.ELClass
+  - javax.el.ELContext
+  - javax.el.ELContextEvent
+  - javax.el.ELException
+  - javax.el.ELManager
+  - javax.el.ELProcessor
+  - javax.el.ELResolver
+  - javax.el.ELUtil
+  - javax.el.ELUtil$1
+  - javax.el.EvaluationListener
+  - javax.el.Expression
+  - javax.el.ExpressionFactory
+  - javax.el.FactoryFinder
+  - javax.el.FunctionMapper
+  - javax.el.ImportHandler
+  - javax.el.LambdaExpression
+  - javax.el.ListELResolver
+  - javax.el.MapELResolver
+  - javax.el.MethodExpression
+  - javax.el.MethodInfo
+  - javax.el.MethodNotFoundException
+  - javax.el.PropertyNotFoundException
+  - javax.el.PropertyNotWritableException
+  - javax.el.ResourceBundleELResolver
+  - javax.el.StandardELContext
+  - javax.el.StandardELContext$1
+  - javax.el.StandardELContext$DefaultFunctionMapper
+  - javax.el.StandardELContext$DefaultVariableMapper
+  - javax.el.StandardELContext$LocalBeanNameResolver
+  - javax.el.StaticFieldELResolver
+  - javax.el.TypeConverter
+  - javax.el.ValueExpression
+  - javax.el.ValueReference
+  - javax.el.VariableMapper

From 15ec491b3630c386e14eacd9286d20886ac7c41f Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@palantir.com>
Date: Wed, 22 Mar 2023 17:13:36 -0400
Subject: [PATCH 2/2] fix class uniqueness

---
 .../baseline-class-uniqueness.lock            | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 conjure-java-jersey-server/baseline-class-uniqueness.lock

diff --git a/conjure-java-jersey-server/baseline-class-uniqueness.lock b/conjure-java-jersey-server/baseline-class-uniqueness.lock
deleted file mode 100644
index b7a73831e..000000000
--- a/conjure-java-jersey-server/baseline-class-uniqueness.lock
+++ /dev/null
@@ -1,50 +0,0 @@
-# Danger! Multiple jars contain identically named classes. This may cause different behaviour depending on classpath ordering.
-# Run ./gradlew checkClassUniqueness --write-locks to update this file
-
-## runtimeClasspath
-[javax.el:javax.el-api, org.glassfish:jakarta.el]
-  - javax.el.ArrayELResolver
-  - javax.el.BeanELResolver
-  - javax.el.BeanELResolver$1
-  - javax.el.BeanELResolver$BPSoftReference
-  - javax.el.BeanELResolver$BeanProperties
-  - javax.el.BeanELResolver$BeanProperty
-  - javax.el.BeanELResolver$SoftConcurrentHashMap
-  - javax.el.BeanNameELResolver
-  - javax.el.BeanNameResolver
-  - javax.el.CompositeELResolver
-  - javax.el.CompositeELResolver$CompositeIterator
-  - javax.el.ELClass
-  - javax.el.ELContext
-  - javax.el.ELContextEvent
-  - javax.el.ELException
-  - javax.el.ELManager
-  - javax.el.ELProcessor
-  - javax.el.ELResolver
-  - javax.el.ELUtil
-  - javax.el.ELUtil$1
-  - javax.el.EvaluationListener
-  - javax.el.Expression
-  - javax.el.ExpressionFactory
-  - javax.el.FactoryFinder
-  - javax.el.FunctionMapper
-  - javax.el.ImportHandler
-  - javax.el.LambdaExpression
-  - javax.el.ListELResolver
-  - javax.el.MapELResolver
-  - javax.el.MethodExpression
-  - javax.el.MethodInfo
-  - javax.el.MethodNotFoundException
-  - javax.el.PropertyNotFoundException
-  - javax.el.PropertyNotWritableException
-  - javax.el.ResourceBundleELResolver
-  - javax.el.StandardELContext
-  - javax.el.StandardELContext$1
-  - javax.el.StandardELContext$DefaultFunctionMapper
-  - javax.el.StandardELContext$DefaultVariableMapper
-  - javax.el.StandardELContext$LocalBeanNameResolver
-  - javax.el.StaticFieldELResolver
-  - javax.el.TypeConverter
-  - javax.el.ValueExpression
-  - javax.el.ValueReference
-  - javax.el.VariableMapper