Mercurial > dive4elements > river
diff contrib/make_flys_release/make_release.sh @ 9744:b1b48fa7bd80 3.2.x
Include both database drivers in one pom.xml
This makes it unnecessary to package for a specific database and makes
it possible to connect to both database backends from the same installation
(e.g. in a Docker container).
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 30 Aug 2022 14:33:20 +0200 |
| parents | ca1319d5816d |
| children | b57b236c4f4e |
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh Mon Aug 29 17:10:27 2022 +0200 +++ b/contrib/make_flys_release/make_release.sh Tue Aug 30 14:33:20 2022 +0200 @@ -37,7 +37,6 @@ -t Tag the selected branch with given name. Note that \$USER is used as the repository user name for pushing the tags. - -o, --oracle Release is for oracle. TARGET must specify a tag (usually MAYOR.MINOR.PATCH) or a branch name. EOF exit 0 @@ -56,8 +55,8 @@ # customizable variables ELBE_MODEL_UUID=${ELBE_MODEL_UUID:-1a4825f6-925f-11e3-8165-001f29e71d12} -OPTS=`getopt -o ?w:,?t:,o \ - -l help,oracle \ +OPTS=`getopt -o ?w:,?t: \ + -l help \ -n $0 -- "$@"` if [ $? != 0 ] ; then usage; fi @@ -72,9 +71,6 @@ "-w") WORK_DIR=$2 shift 2;; - "-o"|"--oracle") - BUILD_ORACLE="TRUE" - shift;; "-t") DO_TAG=$2 shift 2;; @@ -273,14 +269,7 @@ echo "INFO: compile and build sources" cp $WORK_DIR/wsplgen-linux-64bit-static \ $FLYS_SOURCE_DIR/river/artifacts/bin/wsplgen - -if [ "$BUILD_ORACLE" = "TRUE" ]; then - mvn -f $FLYS_SOURCE_DIR/river/backend/pom-oracle.xml clean compile install - mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom-oracle.xml \ - package assembly:single -else - mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml package assembly:single -fi +mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml package assembly:single mvn -f $FLYS_SOURCE_DIR/river/gwt-client/pom.xml clean compile package