From 84ec36043490d97625658aaa21db4d729639d11f Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 10 Jul 2023 15:27:32 +0200
Subject: [PATCH 1/4] Update Maven plugins

Big batch of updates, I will test that on a few projects.
---
 pom.xml | 75 ++++++++++++++++++---------------------------------------
 1 file changed, 24 insertions(+), 51 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bf2cb5..1281144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,37 +87,36 @@
     <!-- ================ -->
     <!-- Plugins versions -->
     <!-- ================ -->
-    <version.assembly.plugin>3.1.1</version.assembly.plugin>
-    <version.clean.plugin>3.2.0</version.clean.plugin>
-    <version.compiler.plugin>3.8.1</version.compiler.plugin>
-    <version.dependency.plugin>3.1.1</version.dependency.plugin>
-    <version.deploy.plugin>3.0.0-M1</version.deploy.plugin>
-    <version.enforcer.plugin>3.1.0</version.enforcer.plugin>
-    <version.surefire.plugin>2.22.2</version.surefire.plugin>
+    <version.assembly.plugin>3.6.0</version.assembly.plugin>
+    <version.clean.plugin>3.3.1</version.clean.plugin>
+    <version.compiler.plugin>3.11.0</version.compiler.plugin>
+    <version.dependency.plugin>3.6.0</version.dependency.plugin>
+    <version.deploy.plugin>3.1.1</version.deploy.plugin>
+    <version.enforcer.plugin>3.3.0</version.enforcer.plugin>
+    <version.surefire.plugin>3.1.2</version.surefire.plugin>
     <version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
-    <version.install.plugin>3.0.0-M1</version.install.plugin>
+    <version.install.plugin>3.1.1</version.install.plugin>
     <version.beanshell.plugin>1.4</version.beanshell.plugin>
-    <version.jar.plugin>3.1.2</version.jar.plugin>
-    <version.jarjar.plugin>1.9</version.jarjar.plugin>
-    <version.javadoc.plugin>3.1.0</version.javadoc.plugin>
-    <version.plugin.plugin>3.6.0</version.plugin.plugin>
-    <version.resources.plugin>3.1.0</version.resources.plugin>
-    <version.shade.plugin>3.2.1</version.shade.plugin>
-    <version.source.plugin>3.1.0</version.source.plugin>
+    <version.jar.plugin>3.3.0</version.jar.plugin>
+    <version.javadoc.plugin>3.5.0</version.javadoc.plugin>
+    <version.plugin.plugin>3.9.0</version.plugin.plugin>
+    <version.resources.plugin>3.3.1</version.resources.plugin>
+    <version.shade.plugin>3.5.0</version.shade.plugin>
+    <version.source.plugin>3.3.0</version.source.plugin>
     <version.site.plugin>3.7.1</version.site.plugin>
-    <version.artifactory.plugin>3.4.0</version.artifactory.plugin>
-    <version.jacoco.plugin>0.8.8</version.jacoco.plugin>
+    <version.artifactory.plugin>3.6.1</version.artifactory.plugin>
+    <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
 
-    <version.buildnumber.plugin>1.4</version.buildnumber.plugin>
-    <version.native2ascii.plugin>1.0-beta-1</version.native2ascii.plugin>
+    <version.buildnumber.plugin>3.1.0</version.buildnumber.plugin>
+    <version.native2ascii.plugin>2.1.0</version.native2ascii.plugin>
 
     <version.sonar-packaging.plugin>1.21.0.505</version.sonar-packaging.plugin>
     <version.sonar-dev.plugin>1.8</version.sonar-dev.plugin>
 
-    <version.codehaus.license.plugin>2.0.0</version.codehaus.license.plugin>
-    <version.mycila.license.plugin>3.0</version.mycila.license.plugin>
-    <version.gpg.plugin>0.3.1</version.gpg.plugin>
-    <version.cyclonedx.plugin>2.6.0</version.cyclonedx.plugin>
+    <version.codehaus.license.plugin>2.2.0</version.codehaus.license.plugin>
+    <version.mycila.license.plugin>4.2</version.mycila.license.plugin>
+    <version.gpg.plugin>3.1.0</version.gpg.plugin>
+    <version.cyclonedx.plugin>2.7.9</version.cyclonedx.plugin>
 
     <!-- To configure maven-license-plugin to check license headers -->
     <license.name>GNU LGPL v3</license.name>
@@ -130,15 +129,6 @@
   </properties>
 
   <build>
-    <extensions>
-      <!-- See SONARPLUGINS-839 and SONARPLUGINS-840 -->
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
-      </extension>
-    </extensions>
-
     <pluginManagement>
       <plugins>
         <!-- Plugins ordered by shortname (archetype, assembly ...) -->
@@ -146,16 +136,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>${version.assembly.plugin}</version>
-          <configuration>
-            <archiverConfig>
-              <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->
-              <!-- 420(dec) = 644(oct) -->
-              <fileMode>420</fileMode>
-              <!-- 493(dec) = 755(oct) -->
-              <directoryMode>493</directoryMode>
-              <defaultDirectoryMode>493</defaultDirectoryMode>
-            </archiverConfig>
-          </configuration>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -235,11 +215,6 @@
             </licenseMerges>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.sonatype.plugins</groupId>
-          <artifactId>jarjar-maven-plugin</artifactId>
-          <version>${version.jarjar.plugin}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
@@ -248,7 +223,7 @@
             <archive>
               <manifestEntries>
                 <Version>${project.version}</Version>
-                <!-- ${buildNumber} is the svn revision generated by the buildnumber-maven-plugin -->
+                <!-- ${buildNumber} is generated by the buildnumber-maven-plugin -->
                 <Implementation-Build>${buildNumber}</Implementation-Build>
                 <Build-Time>${timestamp}</Build-Time>
               </manifestEntries>
@@ -468,7 +443,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <!-- ${buildNumber} is the svn revision generated by the buildnumber-maven-plugin -->
+              <!-- ${buildNumber} is generated by the buildnumber-maven-plugin -->
               <Implementation-Build>${buildNumber}</Implementation-Build>
               <Build-Time>${timestamp}</Build-Time>
             </manifestEntries>
@@ -689,8 +664,6 @@
             </executions>
           </plugin>
           <plugin>
-            <!-- this maven plugin is not deployed in Maven Central. It should be downloaded
-            from JFrog JCenter or from SonarSource repositories -->
             <groupId>org.jfrog.buildinfo</groupId>
             <artifactId>artifactory-maven-plugin</artifactId>
             <version>${version.artifactory.plugin}</version>

From b88943d2d1d9433e6d90e6a778da2d04a13b47de Mon Sep 17 00:00:00 2001
From: Julien Carsique <julien.carsique@sonarsource.com>
Date: Mon, 10 Jul 2023 17:27:04 +0200
Subject: [PATCH 2/4] BUILD-3399 test

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1281144..8e998b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
     <version.shade.plugin>3.5.0</version.shade.plugin>
     <version.source.plugin>3.3.0</version.source.plugin>
     <version.site.plugin>3.7.1</version.site.plugin>
-    <version.artifactory.plugin>3.6.1</version.artifactory.plugin>
+    <version.artifactory.plugin>3.4.0</version.artifactory.plugin>
     <version.jacoco.plugin>0.8.10</version.jacoco.plugin>
 
     <version.buildnumber.plugin>3.1.0</version.buildnumber.plugin>

From 27acb5d67d7e8abee9fa27f8390125777883f276 Mon Sep 17 00:00:00 2001
From: Julien Carsique <julien.carsique@sonarsource.com>
Date: Mon, 10 Jul 2023 17:27:31 +0200
Subject: [PATCH 3/4] BUILD-3399 remove deprecated vault resource

---
 .cirrus/secrets/parent-oss.hcl | 80 ----------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 .cirrus/secrets/parent-oss.hcl

diff --git a/.cirrus/secrets/parent-oss.hcl b/.cirrus/secrets/parent-oss.hcl
deleted file mode 100644
index c105fbf..0000000
--- a/.cirrus/secrets/parent-oss.hcl
+++ /dev/null
@@ -1,80 +0,0 @@
-secret {
-    no_prefix = true
-    path      = "github/token/SonarSource-parent-oss-ro"
-    key {
-        name   = "token"
-        format = "GITHUB_TOKEN"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "kv/data/repox"
-    key {
-        name   = "url"
-        format = "ARTIFACTORY_URL"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "artifactory/token/SonarSource-parent-oss-private-reader"
-    key {
-        name   = "access_token"
-        format = "ARTIFACTORY_PRIVATE_PASSWORD"
-    }
-    key {
-        name   = "access_token"
-        format = "ARTIFACTORY_API_KEY"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "artifactory/token/SonarSource-parent-oss-qa-deployer"
-    key {
-        name   = "access_token"
-        format = "ARTIFACTORY_DEPLOY_PASSWORD"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "kv/data/burgr"
-    key {
-        name   = "url"
-        format = "BURGR_URL"
-    }
-    key {
-        name   = "cirrus_username"
-        format = "BURGR_USERNAME"
-    }
-    key {
-        name   = "cirrus_password"
-        format = "BURGR_PASSWORD"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "kv/data/next"
-    key {
-        name   = "token"
-        format = "SONAR_TOKEN"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "kv/data/sign"
-    key {
-        name   = "passphrase"
-        format = "PGP_PASSPHRASE"
-    }
-}
-secret {
-    no_prefix = true
-    path      = "kv/data/promote"
-    key {
-        name   = "token"
-        format = "GCF_ACCESS_TOKEN"
-    }
-    key {
-        name   = "url"
-        format = "PROMOTE_URL"
-    }
-}

From 82be0f17435c0ac196fdb5fb617203c936072960 Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 11 Jul 2023 10:27:33 +0200
Subject: [PATCH 4/4] Fix the sign plugin version

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e998b0..6c1dfb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
 
     <version.codehaus.license.plugin>2.2.0</version.codehaus.license.plugin>
     <version.mycila.license.plugin>4.2</version.mycila.license.plugin>
-    <version.gpg.plugin>3.1.0</version.gpg.plugin>
+    <version.sign.plugin>1.0.1</version.sign.plugin>
     <version.cyclonedx.plugin>2.7.9</version.cyclonedx.plugin>
 
     <!-- To configure maven-license-plugin to check license headers -->
@@ -292,7 +292,7 @@
         <plugin>
           <groupId>org.simplify4u.plugins</groupId>
           <artifactId>sign-maven-plugin</artifactId>
-          <version>${version.gpg.plugin}</version>
+	  <version>${version.sign.plugin}</version>
         </plugin>
         <plugin>
           <groupId>org.cyclonedx</groupId>
@@ -561,7 +561,7 @@
           <plugin>
             <groupId>org.simplify4u.plugins</groupId>
             <artifactId>sign-maven-plugin</artifactId>
-            <version>${version.gpg.plugin}</version>
+            <version>${version.sign.plugin}</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>