changeset 9719:f3aa7a12c86a 3.2.x

It's no longer necessary to install these artifacts from a file Oracle-JDBC drivers are fetched from Maven repository since rev. ee1b409af91c.
author Tom Gottfried <tom@intevation.de>
date Mon, 12 Jul 2021 14:39:58 +0200 (2021-07-12)
parents ee1b409af91c
children 13e2d38ad314
files contrib/make_flys_release/bin/make-importer-package.sh contrib/make_flys_release/make_release.sh etl/doc/README.txt
diffstat 3 files changed, 1 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/make_flys_release/bin/make-importer-package.sh	Mon Jul 12 14:08:26 2021 +0200
+++ b/contrib/make_flys_release/bin/make-importer-package.sh	Mon Jul 12 14:39:58 2021 +0200
@@ -26,8 +26,6 @@
 OPTIONS:
    -?, --help          Show this message
    -o, --oracle        Package is for Oracle.
-                       Suitable jar-file for JDBC driver has to be given with
-                       the environment variable ORACLE_JDBC
    VERSION must specify a tag (usually MAYOR.MINOR.PATCH) or a branch name.
    With EXTRAS, a tarball with dependencies can be given.
 EOF
@@ -84,13 +82,6 @@
 
 # package importer
 if [ "$BUILD_ORACLE" = "TRUE" ]; then
-    if [ ! -f $ORACLE_JDBC ]; then
-        echo "Could not find oracle jdbc in $ORACLE_JDBC"
-        echo "Please make sure that the ORACLE_JDBC variable is set correctly"
-        exit 1
-    fi
-    mvn install:install-file -DgroupId=ojdbc -DartifactId=ojdbc \
-       -Dversion=0 -Dpackaging=jar -Dfile=$ORACLE_JDBC -DgeneratePom=true
     mvn -f $SOURCE_DIR/backend/pom-oracle.xml clean package assembly:single
 else
     mvn -f $SOURCE_DIR/backend/pom.xml clean package assembly:single
--- a/contrib/make_flys_release/make_release.sh	Mon Jul 12 14:08:26 2021 +0200
+++ b/contrib/make_flys_release/make_release.sh	Mon Jul 12 14:39:58 2021 +0200
@@ -38,8 +38,6 @@
                        Note that \$USER is used as the repository user name
                        for pushing the tags.
    -o, --oracle        Release is for oracle.
-                       Suitable jar-file for JDBC driver has to be given with
-                       the environment variable ORACLE_JDBC
    TARGET must specify a tag (usually MAYOR.MINOR.PATCH) or a branch name.
 EOF
 exit 0
@@ -268,13 +266,6 @@
     $FLYS_SOURCE_DIR/river/artifacts/bin/wsplgen
 
 if [ "$BUILD_ORACLE" = "TRUE" ]; then
-    if [ ! -f $ORACLE_JDBC ]; then
-        echo "Could not find oracle jdbc in $ORACLE_JDBC"
-        echo "Please make sure that the ORACLE_JDBC variable is set correctly"
-        exit 1
-    fi
-    mvn install:install-file -DgroupId=ojdbc -DartifactId=ojdbc \
-       -Dversion=0 -Dpackaging=jar -Dfile=$ORACLE_JDBC -DgeneratePom=true
     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
--- a/etl/doc/README.txt	Mon Jul 12 14:08:26 2021 +0200
+++ b/etl/doc/README.txt	Mon Jul 12 14:39:58 2021 +0200
@@ -22,13 +22,7 @@
      $ mvn --version
      Sollte Versionsinformationen ausgeben.
 
-   * Für die Nutzung der Oracle-JDBC-Bindings muss das Oracle-Treiber-Jar
-     in das lokale Maven-Repository installiert werden:
-
-     $ mvn install:install-file -DgroupId=ojdbc7.jar -DartifactId=ojdbc7 \
-       -Dversion=0 -Dpackaging=jar -Dfile=ojdbc7.jar -DgeneratePom=true
-
-   * Für den eigentlichen Oracle-kompatiblen Bau kann dann folgendes
+   * Für den Oracle-kompatiblen Bau kann dann folgendes
      aufgerufen werden:
 
      $ mvn -f pom-oracle.xml clean package assembly:single

http://dive4elements.wald.intevation.org