From 3e2225e6501b5a2a65f3cc593d792d713758b8f2 Mon Sep 17 00:00:00 2001
From: Julien Giovaresco <dev@giovaresco.fr>
Date: Tue, 18 Jul 2023 09:57:32 +0200
Subject: [PATCH] chore(deps): update gravitee-parent

BREAKING CHANGE: require Java17
---
 .github/renovate.json                         | 37 ++++++----
 pom.xml                                       | 25 +------
 src/assembly/policy-assembly.xml              |  4 +-
 .../gravitee/policy/apikey/ApiKeyPolicy.java  |  6 +-
 .../apikey/ApiKeyPolicyInitializer.java       |  6 +-
 .../ApiKeyPolicyConfiguration.java            |  6 +-
 .../policy/v3/apikey/ApiKeyPolicyV3.java      |  6 +-
 .../apikey/ApiKeyPolicyInitializerTest.java   |  6 +-
 .../policy/apikey/ApiKeyPolicyTest.java       |  6 +-
 ...olicyV4EmulationEngineIntegrationTest.java |  6 +-
 .../apikey/ApiKeyPolicyV3IntegrationTest.java |  6 +-
 .../policy/v3/apikey/ApiKeyPolicyV3Test.java  |  6 +-
 src/test/resources/apis/api-key.json          | 74 +++++++++----------
 13 files changed, 92 insertions(+), 102 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d53524c3..c41f20b5 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,14 +1,25 @@
 {
-  "extends": [
-    "config:base",
-    "schedule:earlyMondays"
-  ],
-  "prConcurrentLimit": 3,
-  "rebaseWhen": "conflicted",
-  "packageRules": [
-    {
-      "matchDatasources": ["orb"],
-      "rangeStrategy": "replace"
-    }
-  ]
-}
\ No newline at end of file
+    "extends": ["config:base", ":label(dependencies)"],
+    "rebaseWhen": "conflicted",
+    "packageRules": [
+        {
+            "matchDatasources": ["orb"],
+            "matchUpdateTypes": ["patch", "minor"],
+            "automerge": true,
+            "automergeType": "branch",
+            "semanticCommitType": "ci"
+        },
+        {
+            "matchDepTypes": ["provided", "test", "build", "import", "parent"],
+            "matchUpdateTypes": ["patch", "minor"],
+            "automerge": true,
+            "automergeType": "branch",
+            "semanticCommitType": "chore"
+        },
+        {
+            "matchDepTypes": ["provided", "test", "build", "import", "parent"],
+            "matchUpdateTypes": ["major"],
+            "semanticCommitType": "chore"
+        }
+    ]
+}
diff --git a/pom.xml b/pom.xml
index 464869d4..227c10e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+    Copyright © 2015 The Gravitee team (http://gravitee.io)
 
     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
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,7 +30,7 @@
     <parent>
         <groupId>io.gravitee</groupId>
         <artifactId>gravitee-parent</artifactId>
-        <version>21.0.1</version>
+        <version>22.0.2</version>
     </parent>
 
     <properties>
@@ -42,8 +42,6 @@
         <gravitee-apim.version>4.0.0-SNAPSHOT</gravitee-apim.version>
 
         <maven-plugin-assembly.version>3.6.0</maven-plugin-assembly.version>
-        <maven-plugin-prettier.version>0.19</maven-plugin-prettier.version>
-        <maven-plugin-prettier.prettierjava.version>1.6.2</maven-plugin-prettier.prettierjava.version>
         <maven-plugin-properties.version>1.1.0</maven-plugin-properties.version>
         <!-- Property used by the publication job in CI-->
         <publish-folder-path>graviteeio-apim/plugins/policies</publish-folder-path>
@@ -186,23 +184,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.hubspot.maven.plugins</groupId>
-                <artifactId>prettier-maven-plugin</artifactId>
-                <version>${maven-plugin-prettier.version}</version>
-                <configuration>
-                    <prettierJavaVersion>${maven-plugin-prettier.prettierjava.version}</prettierJavaVersion>
-                    <skip>${skip.validation}</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/assembly/policy-assembly.xml b/src/assembly/policy-assembly.xml
index ec6476b0..ed15807c 100644
--- a/src/assembly/policy-assembly.xml
+++ b/src/assembly/policy-assembly.xml
@@ -1,12 +1,12 @@
 <!--
 
-    Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+    Copyright © 2015 The Gravitee team (http://gravitee.io)
 
     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
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicy.java b/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicy.java
index 99a1c8aa..2385449f 100644
--- a/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicy.java
+++ b/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicy.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializer.java b/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializer.java
index 0421606b..a5ac6e19 100644
--- a/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializer.java
+++ b/src/main/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializer.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/apikey/configuration/ApiKeyPolicyConfiguration.java b/src/main/java/io/gravitee/policy/apikey/configuration/ApiKeyPolicyConfiguration.java
index 8b061b3f..f7f06ac8 100644
--- a/src/main/java/io/gravitee/policy/apikey/configuration/ApiKeyPolicyConfiguration.java
+++ b/src/main/java/io/gravitee/policy/apikey/configuration/ApiKeyPolicyConfiguration.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3.java b/src/main/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3.java
index af0cb1e1..65af06da 100644
--- a/src/main/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3.java
+++ b/src/main/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializerTest.java b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializerTest.java
index 191a8c1b..04a5ac5b 100644
--- a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializerTest.java
+++ b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyInitializerTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyTest.java b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyTest.java
index 9adf521a..df7234fb 100644
--- a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyTest.java
+++ b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyV4EmulationEngineIntegrationTest.java b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyV4EmulationEngineIntegrationTest.java
index 68c2deab..1080e6bd 100644
--- a/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyV4EmulationEngineIntegrationTest.java
+++ b/src/test/java/io/gravitee/policy/apikey/ApiKeyPolicyV4EmulationEngineIntegrationTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3IntegrationTest.java b/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3IntegrationTest.java
index a3dc2a82..e606e485 100644
--- a/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3IntegrationTest.java
+++ b/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3IntegrationTest.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3Test.java b/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3Test.java
index 71631d06..1e2d84cb 100644
--- a/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3Test.java
+++ b/src/test/java/io/gravitee/policy/v3/apikey/ApiKeyPolicyV3Test.java
@@ -1,11 +1,11 @@
-/**
- * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+/*
+ * Copyright © 2015 The Gravitee team (http://gravitee.io)
  *
  * 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
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/test/resources/apis/api-key.json b/src/test/resources/apis/api-key.json
index 2988ccd5..39fb4b11 100644
--- a/src/test/resources/apis/api-key.json
+++ b/src/test/resources/apis/api-key.json
@@ -1,42 +1,40 @@
 {
-  "id": "my-api",
-  "name": "my-api",
-  "gravitee": "2.0.0",
-  "proxy": {
-    "context_path": "/test",
-    "endpoints": [
-      {
-        "name": "default",
-        "target": "http://localhost:8080/team",
-        "http": {
-          "connectTimeout": 3000,
-          "readTimeout": 60000
-        }
-      }
-    ]
-  },
-  "flows": [
-    {
-      "name": "flow-1",
-      "methods": [
-        "GET"
-      ],
-      "enabled": true,
-      "path-operator": {
-        "path": "/",
-        "operator": "STARTS_WITH"
-      },
-      "pre": [
+    "id": "my-api",
+    "name": "my-api",
+    "gravitee": "2.0.0",
+    "proxy": {
+        "context_path": "/test",
+        "endpoints": [
+            {
+                "name": "default",
+                "target": "http://localhost:8080/team",
+                "http": {
+                    "connectTimeout": 3000,
+                    "readTimeout": 60000
+                }
+            }
+        ]
+    },
+    "flows": [
         {
-          "name": "API Key",
-          "description": "",
-          "enabled": true,
-          "policy": "api-key",
-          "configuration": {}
+            "name": "flow-1",
+            "methods": ["GET"],
+            "enabled": true,
+            "path-operator": {
+                "path": "/",
+                "operator": "STARTS_WITH"
+            },
+            "pre": [
+                {
+                    "name": "API Key",
+                    "description": "",
+                    "enabled": true,
+                    "policy": "api-key",
+                    "configuration": {}
+                }
+            ],
+            "post": []
         }
-      ],
-      "post": []
-    }
-  ],
-  "resources": []
+    ],
+    "resources": []
 }