Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-1236 - Integrate nohttp tooling into CI build profile.

Browse Source
This commit is contained in:
Mark Paluch
2019-06-18 11:02:44 +02:00
parent e8d37e20de
commit be09a2c2a3
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checkstyle/config.xml
View File

@@ -18,4 +18,6 @@
<module name="NewlineAtEndOfFile"/>
<module name="SuppressWarningsFilter" />
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck" />
</module>

2
checkstyle/suppressions.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress checks="RegexpHeader" files="package-info\.java"/>
</suppressions>

24
pom.xml
View File

@@ -43,6 +43,7 @@
<project.type>multi</project.type>
<checkstyle.version>8.18</checkstyle.version>
<nohttp.version>0.0.3.RELEASE</nohttp.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<neo4j.ogm.version>3.1.11</neo4j.ogm.version>
<springdata.commons>2.1.10.BUILD-SNAPSHOT</springdata.commons>
@@ -281,22 +282,27 @@
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
<dependency>
<groupId>io.spring.nohttp</groupId>
<artifactId>nohttp-checkstyle</artifactId>
<version>${nohttp.version}</version>
</dependency>
</dependencies>
<configuration>
<configLocation>checkstyle/config.xml</configLocation>
<suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
<headerLocation>checkstyle/java-header.txt</headerLocation>
<encoding>${project.build.sourceEncoding}</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration combine.self="override">
<configLocation>checkstyle/config.xml</configLocation>
<suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
<headerLocation>checkstyle/java-header.txt</headerLocation>
<encoding>${project.build.sourceEncoding}</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<executions>
<execution>
<id>validate</id>

2
spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
View File

@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* @author: Vince Bickers
* @see http://stackoverflow.com/questions/17224887/java-spring-transactional-method-not-rolling-back-as-expected
* @see https://stackoverflow.com/questions/17224887/java-spring-transactional-method-not-rolling-back-as-expected
* @see DATAGRAPH-602
*/
@ContextConfiguration(classes = { ExtendedTransactionsTests.ApplicationConfig.class })