From 565dd483f368ab9ac248996ae8def5080f8b5dde Mon Sep 17 00:00:00 2001
From: David DE CARVALHO <ddecarvalho@solocal.com>
Date: Sat, 17 Dec 2022 00:28:42 +0100
Subject: [PATCH] help for PR 15

---
 java-plugin/pom.xml   | 27 +++++++++++++++------------
 pom.xml               | 14 ++++++++++----
 python-plugin/pom.xml | 27 +++++++++++++++------------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/java-plugin/pom.xml b/java-plugin/pom.xml
index e9eb695b6..62607b3e8 100644
--- a/java-plugin/pom.xml
+++ b/java-plugin/pom.xml
@@ -88,7 +88,10 @@
                     <pluginClass>fr.cnumr.java.MyJavaRulesPlugin</pluginClass>
                     <sonarLintSupported>true</sonarLintSupported>
                     <sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
-                    <requirePlugins>java:${sonarjava.version}</requirePlugins>
+                    <!-- TODO : commented because plugin not loaded in SONAR if required version of java plugin is not installed -->
+                    <!-- TODO : check how to resolve it (how to force this version in SonarQube installation) -->
+                    <!-- <requirePlugins>java:${sonarjava.version}</requirePlugins> -->
+                    <basePlugin>java</basePlugin>
                 </configuration>
             </plugin>
             <plugin>
@@ -121,16 +124,16 @@
                             <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                            <groupId>${project.groupId}</groupId>
-                            <artifactId>${project.artifactId}</artifactId>
-                            <version>${project.version}</version>
-                            <type>jar</type>
-                            <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>../lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>${project.artifactId}</artifactId>
+                                <version>${project.version}</version>
+                                <type>jar</type>
+                                <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- only required to run UT - these are UT dependencies -->
@@ -138,7 +141,7 @@
                         <id>copy</id>
                         <phase>test-compile</phase>
                         <goals>
-                           <goal>copy</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
                             <artifactItems>
diff --git a/pom.xml b/pom.xml
index f27f99481..4f52d08d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,9 +55,17 @@
     
 		<sonar-plugin-api-impl.version>9.7.1.62043</sonar-plugin-api-impl.version>
 		<sonar-analyzer-commons.version>2.1.0.1111</sonar-analyzer-commons.version>
-		<sonar.python.version>3.9.0.9230</sonar.python.version>
-		<sonarphp.version>3.3.0.5166</sonarphp.version>
+		<sonar.python.version>3.21.0.10628</sonar.python.version>
+		<sonarphp.version>3.25.0.9077</sonarphp.version>
 		<sonar-packaging.version>1.20.0.405</sonar-packaging.version>
+		<!-- TODO : LAST version of plugin not possible for the moment because we should change plugin options
+		error message : "A SonarLint compatible plugin should not package dependencies. Please set property 'skipDependenciesPackaging' to 'true' and use the maven-shade-plugin to shade instead."
+		causes :
+		- https://sonarsource.atlassian.net/browse/SONAR-14342
+		- https://sonarsource.atlassian.net/browse/PACKMP-13
+		- commit : https://github.com/SonarSource/sonar-packaging-maven-plugin/commit/ef512488305dc6cf9d553ace73d94c49ea9b12f4
+		-->
+		<!-- <sonar-packaging.version>1.21.0.505</sonar-packaging.version> -->
 
 		<junit.version>4.13.2</junit.version>
 		<junit.jupiter.version>5.9.1</junit.jupiter.version>
@@ -80,14 +88,12 @@
 				<groupId>org.sonarsource.analyzer-commons</groupId>
 				<artifactId>sonar-analyzer-commons</artifactId>
 				<version>${sonar-analyzer-commons.version}</version>
-				<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.sonarsource.sonarqube</groupId>
 				<artifactId>sonar-plugin-api-impl</artifactId>
 				<version>${sonar-plugin-api-impl.version}</version>
-				<scope>compile</scope>
 			</dependency>
 
 			<!-- JAVA -->
diff --git a/python-plugin/pom.xml b/python-plugin/pom.xml
index e3b9aa96b..f5df412b1 100644
--- a/python-plugin/pom.xml
+++ b/python-plugin/pom.xml
@@ -61,7 +61,10 @@
                     <pluginClass>fr.cnumr.python.CustomPythonRulesPlugin</pluginClass>
                     <sonarLintSupported>true</sonarLintSupported>
                     <sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
-                    <requirePlugins>python:${sonar.python.version}</requirePlugins>
+                    <!-- TODO : commented because plugin not loaded in SONAR if required version of python plugin is not installed -->
+                    <!-- TODO : check how to resolve it (how to force this version in SonarQube installation) -->
+                    <!-- <requirePlugins>python:${sonar.python.version}</requirePlugins> -->
+                    <basePlugin>python</basePlugin>
                 </configuration>
             </plugin>
             <plugin>
@@ -72,19 +75,19 @@
                         <id>copy-bundle</id>
                         <phase>package</phase>
                         <goals>
-                        <goal>copy</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>${project.groupId}</groupId>
-                                <artifactId>${project.artifactId}</artifactId>
-                                <version>${project.version}</version>
-                                <type>jar</type>
-                                <overWrite>true</overWrite>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>../lib</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>