diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..eb5a316cb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target diff --git a/.travis.yml b/.travis.yml index 6e963e5e0..917761435 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,8 @@ jobs: name: "Release stage" script: - ci/release.sh . $TRAVIS_TAG + && mvn install -q -DskipTests + && mvn prepare-package -q -f ./rest/taskana-rest-spring-test && ci/release.sh lib $TRAVIS_TAG && ci/release.sh lib/taskana-core $TRAVIS_TAG && ci/release.sh lib/taskana-spring $TRAVIS_TAG diff --git a/ci/release.sh b/ci/release.sh index 2ec90e297..4fd16a5ed 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -70,7 +70,7 @@ function change_version { function main { [[ $# -eq 0 || "$1" == '-h' || "$1" == '--help' ]] && helpAndExit 0 - [[ "$2" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && change_version "$1" "${2##v}" + [[ "$1" == '.' && "$2" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && change_version "$1" "${2##v}" decodeAndImportKeys `dirname "$0"` release "$1" `[[ "$2" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` "`dirname "$0"`/mvnsettings.xml" } diff --git a/ci/test.sh b/ci/test.sh index 481234035..bde670a56 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -33,24 +33,24 @@ function main { eval "$REL/prepare_db.sh '$1'" if [[ "$1" == "H2" && "$2" == "REST" ]]; then (cd $REL/../web && npm run test) - (cd $REL/../rest/ && mvn clean install -q -B) #reinstalling rest because rest-doc is built during tests. - (cd $REL/../rest/ && mvn clean verify -q -B -pl taskana-rest-spring-example -P history.plugin) + (cd $REL/../rest/ && mvn install -q -B) #reinstalling rest because rest-doc is built during tests. + (cd $REL/../rest/ && mvn verify -q -B -pl taskana-rest-spring-example -P history.plugin) elif [[ "$1" == "H2" && "$2" == "LIB" ]]; then - (cd $REL/.. && mvn clean install -q -N -B ) - (cd $REL/../lib/ && mvn clean install -q -B -Dmaven.javadoc.skip) + (cd $REL/.. && mvn install -q -N -B ) + (cd $REL/../lib/ && mvn install -q -B -Dmaven.javadoc.skip) elif [[ "$1" == "POSTGRES_10_4" && "$2" == "CORE" ]]; then - (cd $REL/.. && mvn clean install -q -N -B) - (cd $REL/../lib && mvn clean install -q -N -B) - (cd $REL/../lib/taskana-core && mvn clean verify -q -B) + (cd $REL/.. && mvn install -q -N -B) + (cd $REL/../lib && mvn install -q -N -B) + (cd $REL/../lib/taskana-core && mvn verify -q -B) elif [[ "$1" == "POSTGRES_10_4" && "$2" == "WILDFLY" ]]; then #installing dependencies for rest (since this tests runs in a different cache) - mvn clean install -q -N - (cd $REL/../lib/ && mvn clean install -q -B -DskipTests -Dmaven.javadoc.skip) + mvn install -q -N + (cd $REL/../lib/ && mvn install -q -B -DskipTests -Dmaven.javadoc.skip) - (cd $REL/../rest/ && mvn clean install -q -B -DskipTests -pl !taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip) - (cd $REL/../rest/ && mvn clean install -q -B -pl taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip -P postgres) + (cd $REL/../rest/ && mvn install -q -B -DskipTests -pl !taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip) + (cd $REL/../rest/ && mvn install -q -B -pl taskana-rest-spring-wildfly-example -Dmaven.javadoc.skip -P postgres) else - (cd $REL/../lib/taskana-core && mvn clean verify -q -B) + (cd $REL/../lib/taskana-core && mvn verify -q -B) fi } diff --git a/rest/taskana-rest-spring-example/.classpath b/rest/taskana-rest-spring-example/.classpath deleted file mode 100644 index 002ad570e..000000000 --- a/rest/taskana-rest-spring-example/.classpath +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rest/taskana-rest-spring-example/.project b/rest/taskana-rest-spring-example/.project deleted file mode 100644 index e56b84f3e..000000000 --- a/rest/taskana-rest-spring-example/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - taskana-rest-spring-example - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/rest/taskana-rest-spring-example/.settings/org.eclipse.core.resources.prefs b/rest/taskana-rest-spring-example/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf9995..000000000 --- a/rest/taskana-rest-spring-example/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/rest/taskana-rest-spring-example/.settings/org.eclipse.jdt.core.prefs b/rest/taskana-rest-spring-example/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 9c81ef9c8..000000000 --- a/rest/taskana-rest-spring-example/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8