Skip to content

Commit 10faf2d

Browse files
committed
CHANGELOG update + upgrade ecocode-rules-spec to 1.4.6 + rework on pom.xml + Dockerfile
1 parent 011c212 commit 10faf2d

3 files changed

Lines changed: 11 additions & 25 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414

1515
### Changed
1616

17-
- Update ecocode-rules-specifications to 1.4.4
17+
- Update ecocode-rules-specifications to 1.4.6
1818

1919
### Deleted
2020

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ WORKDIR /usr/src/ecocode
66
RUN ./tool_build.sh
77

88
FROM sonarqube:10.3.0-community
9-
COPY --from=builder /usr/src/ecocode/target/ecocode-java-plugin-*.jar /opt/sonarqube/extensions/plugins/
9+
COPY --from=builder /usr/src/ecocode/target/ecocode-*.jar /opt/sonarqube/extensions/plugins/

pom.xml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<google.re2j>1.7</google.re2j>
6868

6969
<!-- temporary version waiting for real automatic release in ecocode repository -->
70-
<ecocode-rules-specifications.version>1.4.4</ecocode-rules-specifications.version>
70+
<ecocode-rules-specifications.version>1.4.6</ecocode-rules-specifications.version>
7171

7272
</properties>
7373

@@ -163,7 +163,6 @@
163163
</execution>
164164
<execution>
165165
<id>report</id>
166-
<!-- <phase>test</phase>-->
167166
<goals>
168167
<goal>report</goal>
169168
</goals>
@@ -224,10 +223,15 @@
224223
<createDependencyReducedPom>false</createDependencyReducedPom>
225224
<filters>
226225
<filter>
227-
<artifact>org.*:*</artifact>
226+
<artifact>org.sonarsource.analyzer-commons:sonar-analyzer-commons:*</artifact>
227+
<excludes>
228+
<exclude>META-INF/**</exclude>
229+
</excludes>
230+
</filter>
231+
<filter>
232+
<artifact>com.google.re2j:re2j:*</artifact>
228233
<excludes>
229234
<exclude>META-INF/**</exclude>
230-
<exclude>javax/annotation/**</exclude>
231235
</excludes>
232236
</filter>
233237
<filter>
@@ -246,25 +250,7 @@
246250
<artifactId>maven-dependency-plugin</artifactId>
247251
<version>3.6.0</version>
248252
<executions>
249-
<execution>
250-
<id>copy-bundle</id>
251-
<phase>package</phase>
252-
<goals>
253-
<goal>copy</goal>
254-
</goals>
255-
<configuration>
256-
<artifactItems>
257-
<artifactItem>
258-
<groupId>${project.groupId}</groupId>
259-
<artifactId>${project.artifactId}</artifactId>
260-
<version>${project.version}</version>
261-
<type>jar</type>
262-
<overWrite>true</overWrite>
263-
</artifactItem>
264-
</artifactItems>
265-
<outputDirectory>../lib</outputDirectory>
266-
</configuration>
267-
</execution>
253+
<!-- only for unit tests ("test-jars" directory used in classpath) -->
268254
<execution>
269255
<id>copy</id>
270256
<phase>test-compile</phase>

0 commit comments

Comments
 (0)