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

TSK-369: Fix rest documentation

This commit is contained in:
Benjamin Eckstein 2020-01-22 09:20:16 +01:00 committed by Mustapha Zorgati
parent a1c1e4e9ac
commit 25919195ed
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -43,6 +43,7 @@ env:
- DB=POSTGRES_10_4
install: skip
# include SONAR_PROJECT_KEY as a second parameter if this is not a pull request
script: ci/test.sh "$DB" "$([ "false" = "$TRAVIS_PULL_REQUEST" ] && echo "$SONAR_PROJECT_KEY")"
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana"

4
ci/compile.sh
View File

@ -37,12 +37,12 @@ function main() {
;;
REST)
set -x
mvn -q install -B -f $REL/.. -pl :taskana-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
mvn -q install -B -f $REL/.. -pl :taskana-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
mvn -q test-compile -B -f $REL/../rest
;;
HISTORY)
set -x
mvn -q install -B -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
mvn -q install -B -f $REL/.. -pl :taskana-rest-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
mvn -q test-compile -B -f $REL/../history
;;
esac

8
ci/test.sh
View File

@ -35,8 +35,8 @@ function main() {
set -x
eval "$REL/prepare_db.sh '$1'"
# We can not use the fance '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049
(cd $REL/.. && mvn -q install -B -T 4C -am -Pcoverage -Dmaven.javadoc.skip -Dcheckstyle.skip)
(cd $REL/.. && mvn -q install -B -T 4C -am -Pcoverage -Dcheckstyle.skip)
eval "$REL/verify_docs_jar.sh"
# disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371
if [ -n "$2" ]; then
#-Pcoverage to activate jacoco and test coverage reports
@ -53,7 +53,7 @@ function main() {
set -x
eval "$REL/prepare_db.sh '$1'"
### INSTALL ###
mvn -q install -B -f $REL/.. -P postgres -am -T 4C -pl :taskana-rest-spring-example-wildfly -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
mvn -q install -B -f $REL/.. -P postgres -am -T 4C -pl :taskana-rest-spring-example-wildfly -Dasciidoctor.skip -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
### TEST ###
mvn -q verify -B -f $REL/.. -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-core
@ -63,7 +63,7 @@ function main() {
HISTORY)
set -x
### INSTALL ###
mvn -q install -B -f $REL/.. -am -T 4C -pl :taskana-rest-spring -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
mvn -q install -B -f $REL/.. -am -T 4C -pl :taskana-rest-spring -Dasciidoctor.skip -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
### TEST ###
mvn -q verify -B -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip

1
ci/verify_docs_jar.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash
set -e #fail fast
#check that first dir has same amount of files as second dir
function verifyDocs() {
test -d "$1"
test $(find "$1" | wc -l) -eq $(grep "$2" <<<"$JAR_CONTENT" | wc -l)

5
pom.xml
View File

@ -303,6 +303,11 @@
<version>${version.maven.surefire}</version>
<configuration>
<argLine>${argLine}</argLine>
<!-- Required for generation of REST documentation -->
<includes>
<include>**/*Test.java</include>
<include>**/*Documentation.java</include>
</includes>
</configuration>
</plugin>
<plugin>

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

@ -180,6 +180,12 @@
<snippets>${basedir}/target/generated-snippets</snippets>
<docinfo>shared</docinfo>
</attributes>
<logHandler>
<outputToConsole>false</outputToConsole>
<failIf>
<severity>ERROR</severity>
</failIf>
</logHandler>
</configuration>
</execution>
</executions>