nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-783 Reenable checkstyle, javadoc and source plugin, remove eclipse error marker on checkstyle plugin

This commit is contained in:
BerndBreier 2019-02-03 20:36:38 +01:00 committed by Holger Hagen
parent 279a4413be
commit 763a85d076
4 changed files with 90 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
lib/taskana-core/pom.xml
View File

@ -195,30 +195,61 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>2.17</version> <version>1.0.0</version>
<executions> <configuration>
<execution> <lifecycleMappingMetadata>
<id>validate</id> <pluginExecutions>
<phase>validate</phase> <pluginExecution>
<configuration> <pluginExecutionFilter>
<configLocation>../../qa/checkstyle/checkstyle.xml</configLocation> <groupId>org.apache.maven.plugins</groupId>
<encoding>UTF-8</encoding> <artifactId>maven-checkstyle-plugin</artifactId>
<consoleOutput>true</consoleOutput> <versionRange>[1.0.0,)</versionRange>
<failsOnError>true</failsOnError> <goals>
<failOnViolation>true</failOnViolation> <goal>check</goal>
<includeTestSourceDirectory>true</includeTestSourceDirectory> </goals>
</configuration> </pluginExecutionFilter>
<goals> <action>
<goal>check</goal> <ignore />
</goals> </action>
</execution> </pluginExecution>
</executions> </pluginExecutions>
</plugin> </lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>../../qa/checkstyle/checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<failOnViolation>true</failOnViolation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -257,7 +288,6 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement>
</build> </build>
<!-- <!--
this repository is needed to fetch com.ibm.db2.jcc this repository is needed to fetch com.ibm.db2.jcc

3
lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java
View File

@ -2,7 +2,6 @@ package acceptance.classification;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -280,7 +279,7 @@ public class UpdateClassificationAccTest extends AbstractAccTest {
@WithAccessId( @WithAccessId(
userName = "dummy", userName = "dummy",
groupNames = {"businessadmin"}) groupNames = {"businessadmin"})
@Test(expected=InvalidArgumentException.class) @Test(expected = InvalidArgumentException.class)
public void testUpdateClassificationWithSameKeyAndParentKey() public void testUpdateClassificationWithSameKeyAndParentKey()
throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, InvalidArgumentException { throws ClassificationNotFoundException, NotAuthorizedException, ConcurrencyException, InvalidArgumentException {

34
rest/taskana-rest-spring/pom.xml
View File

@ -220,6 +220,30 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[1.0.0,)</versionRange>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
@ -242,6 +266,13 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -256,6 +287,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
@ -268,6 +300,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@ -278,6 +311,5 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement>
</build> </build>
</project> </project>

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java
View File

@ -31,7 +31,7 @@ import pro.taskana.ldap.LdapClient;
@Configuration @Configuration
@ComponentScan @ComponentScan
@EnableTransactionManagement @EnableTransactionManagement
public class RestConfiguration{ public class RestConfiguration {
@Value("${taskana.schemaName:TASKANA}") @Value("${taskana.schemaName:TASKANA}")
private String schemaName; private String schemaName;