From 6c22d1b2028ef316b3044beadb111d343ba9884c Mon Sep 17 00:00:00 2001
From: Carter Kozak <ckozak@palantir.com>
Date: Thu, 28 Apr 2022 09:13:30 -0400
Subject: [PATCH 1/2] Fix intellij gradle integration copyright configuration

previously the value was double-escaped, resulting in a
single-line garbled copyright on new files.
---
 .../groovy/com/palantir/baseline/plugins/BaselineIdea.groovy    | 2 +-
 .../com/palantir/baseline/BaselineIdeaIntegrationTest.groovy    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
index 410df88f1..62933c5c1 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy
@@ -319,7 +319,7 @@ class BaselineIdea extends AbstractBaselinePlugin {
     }
 
     private static void createOrUpdateCopyrightFile(Node node, File file, String fileName) {
-        def copyrightText = XmlUtil.escapeControlCharacters(XmlUtil.escapeXml(file.text.trim()))
+        def copyrightText = file.text.trim()
         // Ensure that subsequent runs don't produce duplicate entries
         Node copyrightNode = GroovyXmlUtils.matchOrCreateChild(node, "copyright")
         Node noticeNode = GroovyXmlUtils.matchOrCreateChild(copyrightNode, "option", ["name": "notice"])
diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIdeaIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIdeaIntegrationTest.groovy
index f562b5b28..e35c3a823 100644
--- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIdeaIntegrationTest.groovy
+++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIdeaIntegrationTest.groovy
@@ -116,6 +116,8 @@ class BaselineIdeaIntegrationTest extends AbstractPluginTest {
 
         def apacheCopyright = new File(copyrightDir, "001_apache-2.0.xml").text
         apacheCopyright.contains('<option name="myName" value="001_apache-2.0.txt"/>')
+        // Ensure correct xml encoding (not double-encoded)
+        apacheCopyright.contains('Apache License, Version 2.0 (the &quot;License&quot;)')
 
         def palantirCopyright = new File(copyrightDir, "999_palantir.xml").text
         palantirCopyright.contains('<option name="myName" value="999_palantir.txt"/>')

From b0f51402770720aed7c3b21d49668217a19573f7 Mon Sep 17 00:00:00 2001
From: svc-changelog <svc-changelog@palantir.com>
Date: Thu, 28 Apr 2022 13:21:57 +0000
Subject: [PATCH 2/2] Add generated changelog entries

---
 changelog/@unreleased/pr-2234.v2.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/@unreleased/pr-2234.v2.yml

diff --git a/changelog/@unreleased/pr-2234.v2.yml b/changelog/@unreleased/pr-2234.v2.yml
new file mode 100644
index 000000000..b9d37d857
--- /dev/null
+++ b/changelog/@unreleased/pr-2234.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Fix intellij gradle integration copyright configuration
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2234