diff --git a/.gitignore b/.gitignore index 1120a82..5dfb723 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ # Project exclude paths -/*/target/ \ No newline at end of file +/target/ +/**/target/ +/**/*.versionsBackup \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index d3833cb..d82ad0b 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -8,6 +8,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 2d0e5da..1eeb176 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,8 @@ + + diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e2f443e..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..b1f5ba4 --- /dev/null +++ b/build.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +bDATE=$(date '+%Y%m%d%H%M%S') +bDIR=$(dirname $0) +bDIR=$(cd $bDIR && pwd) + +#OPTS="-DskipTests=true -DproxySet=true -DproxyHost=127.0.0.1 -DproxyPort=3128 -Dhttps.nonProxyHosts=127.0.0.1" +OPTS="-DskipTests=true" + +while test ! -z "$1" ; do + case "$1" in + -major*) + (cd $bDIR && mvn build-helper:parse-version versions:set \ + -DnewVersion="\${parsedVersion.nextMajorVersion}.1.\${parsedVersion.nextIncrementalVersion}" ) || exit 1 + ;; + -minor*) + (cd $bDIR && mvn build-helper:parse-version versions:set \ + -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.nextMinorVersion}.\${parsedVersion.nextIncrementalVersion}" ) || exit 1 + ;; + -release*) + (cd $bDIR && mvn -X build-helper:parse-version versions:set \ + -DnewVersion="\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}" ) || exit 1 + ;; + -clean*) + (cd $bDIR && mvn clean $OPTS -U) || exit 1 + ;; + -pack*) + (cd $bDIR && mvn clean package $OPTS -U) || exit 1 + ;; + -fix*) + (cd $bDIR && mvn -N versions:update-child-modules) || exit 1 + ;; + -install*) + (cd $bDIR && mvn install $OPTS) || exit 1 + ;; + *) echo "unknow option ..." + ;; + esac + shift +done \ No newline at end of file diff --git a/commons-jmelange/pom.xml b/commons-jmelange/pom.xml index c26e151..55129c5 100644 --- a/commons-jmelange/pom.xml +++ b/commons-jmelange/pom.xml @@ -6,7 +6,7 @@ com.github.terefang.jmelange jmelange - 2021.1.0 + 2021.1.1 commons-jmelange diff --git a/dao-jmelange/dao-jmelange.iml b/dao-jmelange/dao-jmelange.iml index d6ebd48..78b2cc5 100644 --- a/dao-jmelange/dao-jmelange.iml +++ b/dao-jmelange/dao-jmelange.iml @@ -1,9 +1,2 @@ - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/dao-jmelange/pom.xml b/dao-jmelange/pom.xml index 70d9cd7..21a60f6 100644 --- a/dao-jmelange/pom.xml +++ b/dao-jmelange/pom.xml @@ -6,7 +6,7 @@ com.github.terefang.jmelange jmelange - 2021.1.0 + 2021.1.1 dao-jmelange diff --git a/pom.xml b/pom.xml index 254fc82..6a4a1fc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,14 @@ com.github.terefang.jmelange jmelange - 2021.1.0 + 2021.1.1 pom commons-jmelange utils-jmelange scripted-jmelange + dao-jmelange diff --git a/scripted-jmelange/pom.xml b/scripted-jmelange/pom.xml index e322df4..51c9d13 100644 --- a/scripted-jmelange/pom.xml +++ b/scripted-jmelange/pom.xml @@ -6,7 +6,7 @@ com.github.terefang.jmelange jmelange - 2021.1.0 + 2021.1.1 scripted-jmelange @@ -14,12 +14,12 @@ com.github.terefang.jmelange commons-jmelange - 2021.1.0 + 2021.1.1 com.github.terefang.jmelange utils-jmelange - 2021.1.0 + 2021.1.1 diff --git a/utils-jmelange/pom.xml b/utils-jmelange/pom.xml index 94ed8e0..d4cc119 100644 --- a/utils-jmelange/pom.xml +++ b/utils-jmelange/pom.xml @@ -6,7 +6,7 @@ com.github.terefang.jmelange jmelange - 2021.1.0 + 2021.1.1 utils-jmelange