CHANGELOG update + upgrade ecocode-rules-spec to 1.4.6 + rework on po…

…m.xml + Dockerfile
green-code-initiative · Jan 4, 2024 · 10faf2d · 10faf2d
1 parent 011c212
commit 10faf2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Update ecocode-rules-specifications to 1.4.4
+- Update ecocode-rules-specifications to 1.4.6
 
 ### Deleted
 

diff --git a/Dockerfile b/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /usr/src/ecocode
 RUN ./tool_build.sh
 
 FROM sonarqube:10.3.0-community
-COPY --from=builder /usr/src/ecocode/target/ecocode-java-plugin-*.jar /opt/sonarqube/extensions/plugins/
+COPY --from=builder /usr/src/ecocode/target/ecocode-*.jar /opt/sonarqube/extensions/plugins/
diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@
         <google.re2j>1.7</google.re2j>
 
         <!-- temporary version waiting for real automatic release in ecocode repository -->
-        <ecocode-rules-specifications.version>1.4.4</ecocode-rules-specifications.version>
+        <ecocode-rules-specifications.version>1.4.6</ecocode-rules-specifications.version>
 
     </properties>
 
@@ -163,7 +163,6 @@
                     </execution>
                     <execution>
                         <id>report</id>
-<!--                        <phase>test</phase>-->
                         <goals>
                             <goal>report</goal>
                         </goals>
@@ -224,10 +223,15 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <filters>
                                 <filter>
-                                    <artifact>org.*:*</artifact>
+                                    <artifact>org.sonarsource.analyzer-commons:sonar-analyzer-commons:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/**</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>com.google.re2j:re2j:*</artifact>
                                     <excludes>
                                         <exclude>META-INF/**</exclude>
-                                        <exclude>javax/annotation/**</exclude>
                                     </excludes>
                                 </filter>
                                 <filter>
@@ -246,25 +250,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>3.6.0</version>
                 <executions>
-                    <execution>
-                        <id>copy-bundle</id>
-                        <phase>package</phase>
-                        <goals>
-                            <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>
-                        </configuration>
-                    </execution>
+                    <!-- only for unit tests ("test-jars" directory used in classpath) -->
                     <execution>
                         <id>copy</id>
                         <phase>test-compile</phase>