Skip to content

Commit

Permalink
Merge branch 'no-guava' of github.com:Cognifide/AEM-Rules-for-SonarQu…
Browse files Browse the repository at this point in the history
…be into no-guava
  • Loading branch information
Krystian Panek committed Jun 25, 2020
2 parents 6b11e6d + 642d566 commit 449927a
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java
dist: trusty
jdk:
- openjdk8
- openjdk11

# sonar.login
env:
Expand All @@ -18,4 +18,4 @@ addons:
jlQkHyA5sAOW8irorD2PKsrtRV26htgVenttopw2tDUEcWeUPnxncq1WzjxVTpTW12LUFPXyngrnbqjb6PbLVz4Pnyy1kVpE7VjdQIM/FG5h9vT0hSbyCni+p+x3HGucQUjzDLGeMbuto7uPkIoUGnWpIdd140uxI/lzUy+/vf9YA6gWPhXkuEV0PHx0e0/m28/JbQVmJNhVZjsx/JA0OUh/Zo5pFv3U6N88MLdgFvb48q/mQMdzj5WZgm7QuqekTIyMC
Fng0JHydAYJlnXAOuY2NPwGjUtF2cq57K4MlgD3k/ws5gdI8HIITWgKMcosh1gpws8C4PSxHicqy17beNbIE46zSkYtPhwvHOV8zkL4iYwpn3KP9Ar66oWQy44PaEfI4fVI4IQ1CDoukX0+tyVCE4DNnzqif8/AFO2xB+RWqKkqA=

script: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package org.jacoco:jacoco-maven-plugin:report cobertura:cobertura coveralls:report sonar:sonar
script: mvn clean package jacoco:report coveralls:report sonar:sonar
55 changes: 42 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -303,6 +303,24 @@
<target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<!--
The dynamically evaluated @{argLine} variable is required to persist command line parameters
appended by the jacoco maven plugin (jacoco:prepare-agent)
The memory related ones specified inline are a workaround for Windows builds.
See https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi/33757854#33757854
-->
<argLine>
@{argLine} -Xmx1024m -XX:MaxPermSize=256m
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
<artifactId>sonar-packaging-maven-plugin</artifactId>
Expand All @@ -327,23 +345,34 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version>
<version>4.3.0</version>
<dependencies>
<!-- Explicit dep on jaxb-api to avoid problems with
JDK9 and later, until a new version of
coveralls-maven-plugin is released.
See also https://github.com/trautonen/coveralls-maven-plugin/issues/112-->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
<configuration>
<coberturaReports>
<coberturaReport>${project.basedir}/target/report/coverage.xml</coberturaReport>
</coberturaReports>
<repoToken>${coveralls.repo.token}</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<check>true</check>
</configuration>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 449927a

Please sign in to comment.