From 144a96b615e90cb8b9c727d8edb011f48ae2af21 Mon Sep 17 00:00:00 2001
From: Tim te Beek <tim@moderne.io>
Date: Fri, 9 Aug 2024 23:00:12 +0200
Subject: [PATCH] Upgrade wro4j plugin for Java 17

Fixes https://github.com/openrewrite/rewrite/issues/4283
---
 .../META-INF/rewrite/java-version-11.yml      |  4 +++
 .../META-INF/rewrite/java-version-17.yml      |  4 +++
 .../META-INF/rewrite/wro4j-maven-plugin.yml   | 28 -------------------
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 src/main/resources/META-INF/rewrite/wro4j-maven-plugin.yml

diff --git a/src/main/resources/META-INF/rewrite/java-version-11.yml b/src/main/resources/META-INF/rewrite/java-version-11.yml
index 7f61cda364..88ac183e99 100644
--- a/src/main/resources/META-INF/rewrite/java-version-11.yml
+++ b/src/main/resources/META-INF/rewrite/java-version-11.yml
@@ -97,6 +97,10 @@ recipeList:
       newVersion: 3.6.2
   - org.openrewrite.github.SetupJavaUpgradeJavaVersion:
       minimumJavaMajorVersion: 11
+  - org.openrewrite.maven.UpgradePluginVersion:
+      groupId: ro.isdc.wro4j
+      artifactId: wro4j-maven-plugin
+      newVersion: 1.10.1
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.javax.AddJaxbDependencies
diff --git a/src/main/resources/META-INF/rewrite/java-version-17.yml b/src/main/resources/META-INF/rewrite/java-version-17.yml
index df75a10277..fc2cececb4 100644
--- a/src/main/resources/META-INF/rewrite/java-version-17.yml
+++ b/src/main/resources/META-INF/rewrite/java-version-17.yml
@@ -80,6 +80,10 @@ recipeList:
       groupId: com.sonatype.clm
       artifactId: clm-maven-plugin
       newVersion: 2.47.6-01
+  - org.openrewrite.maven.UpgradePluginVersion:
+      groupId: ro.isdc.wro4j
+      artifactId: wro4j-maven-plugin
+      newVersion: 2.1.x
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.DeprecatedJavaxSecurityCert
diff --git a/src/main/resources/META-INF/rewrite/wro4j-maven-plugin.yml b/src/main/resources/META-INF/rewrite/wro4j-maven-plugin.yml
deleted file mode 100644
index bd088b986b..0000000000
--- a/src/main/resources/META-INF/rewrite/wro4j-maven-plugin.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright 2021 the original author or authors.
-# <p>
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# <p>
-# https://www.apache.org/licenses/LICENSE-2.0
-# <p>
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
----
-type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.migrate.wro4j.UpgradeWro4jMavenPluginVersion
-displayName: Upgrade Wro4j plugin version
-description: This recipe will upgrade Wro4j to a more recent version compatible with Java 11.
-tags:
-  - java11
-  - wro4j
-recipeList:
-  - org.openrewrite.maven.UpgradePluginVersion:
-      groupId: ro.isdc.wro4j
-      artifactId: wro4j-maven-plugin
-      newVersion: 1.10.1