Skip to content

Commit

Permalink
Merge dcd478a into 2df2925
Browse files Browse the repository at this point in the history
  • Loading branch information
kkovarik committed Nov 22, 2018
2 parents 2df2925 + dcd478a commit 5e14374
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 10 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
@@ -1,4 +1,9 @@
language: java
addons:
  sonarcloud:
    organization: "openwisesolutions" # registered at sonarcloud.io
    token:
      secure: $SONAR_TOKEN
jdk:
- oraclejdk8
env:
Expand All @@ -19,7 +24,8 @@ after_success:
- .utility/push-javadoc-to-gh-pages.sh
- .utility/publish-artifacts.sh
# 'coveralls:report' goal is responsible for updating coverall.io stats once travisCI build completes
- mvn coveralls:report
- mvn coveralls:report
- mvn spotbugs:spotbugs sonar:sonar -Dsonar.projectKey=OpenWiseSolutions_openhub-framework -Dsonar.organization=openwisesolutions
cache:
directories:
- $HOME/.m2
Expand Down
Expand Up @@ -17,7 +17,11 @@
package org.openhubframework.openhub.component.funnel;

import java.util.Map;
import java.util.Optional;

import javax.annotation.Nullable;

import org.openhubframework.openhub.api.configuration.DbConfigurationParam;
import org.openhubframework.openhub.api.entity.Message;
import org.openhubframework.openhub.spi.AsyncEventNotifier;
import org.openhubframework.openhub.spi.msg.MessageService;
Expand Down Expand Up @@ -78,4 +82,9 @@ protected void doStart() throws Exception {
Assert.notNull(messageService, "messageService mustn't be null");
Assert.notNull(asyncEventNotifier, "asyncEventNotifier mustn't be null");
}

@Nullable
public Optional<String> findParameter(String code) {
return Optional.of("SONAR ISSUE");
}
}
28 changes: 20 additions & 8 deletions pom.xml
Expand Up @@ -206,6 +206,8 @@
<javamelody-version>1.65.0</javamelody-version>
<metrics-version>3.2.0</metrics-version>
<jolokia-version>1.3.5</jolokia-version>
<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
<sonar.java.spotbugs.reportPaths>target/spotbugsXml.xml</sonar.java.spotbugs.reportPaths>
<!-- java ee -->
<jaxb.version>2.2.11</jaxb.version>
<jaxws.version>2.2.12</jaxws.version>
Expand Down Expand Up @@ -601,13 +603,12 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.8</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
<failOnError>false</failOnError>
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>

Expand Down Expand Up @@ -751,6 +752,12 @@
<goals>deploy</goals>
</configuration>
</plugin>

<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>${sonar-maven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -791,8 +798,8 @@
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
</plugin>

<plugin>
Expand Down Expand Up @@ -834,6 +841,11 @@
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
2 changes: 2 additions & 0 deletions sonar-project.properties
@@ -0,0 +1,2 @@
sonar.projectKey=OpenWiseSolutions_openhub-framework
sonar.organization=openwisesolutions
File renamed without changes.
2 changes: 1 addition & 1 deletion test/src/main/resources/application-test.properties
Expand Up @@ -38,7 +38,7 @@ spring.jpa.hibernate.ddl-auto=validate
flyway.enabled=false

# Show or not log for each sql query
spring.jpa.show-sql=true
spring.jpa.show-sql=false

# Additional native properties to set on the JPA provider.
spring.jpa.properties.hibernate.format_sql=true
Expand Down

0 comments on commit 5e14374

Please sign in to comment.