Fix version rcptt-maven-plugin/antrun-plugin. Better log name

Author: ngiger

KernFunktionen/pom.xml

@@ -143,7 +143,7 @@
           </testOptions>
           <aut>
             <!-- use the product build in elexis-${useBranch} -->
-            <explicit>${aut}</explicit>
+            <explicit>${autExplicit}</explicit>
             <args>
               <arg>-nl</arg>
               <arg>${language}_CH</arg>

devenv.nix

@@ -71,7 +71,7 @@
     {name = "elexis_rcptt_it";}
     {name = "elexis";}
   ];
-  services.mysql.enable = true;
+  services.mysql.enable = false;
   services.mysql.ensureUsers = [
     {
       name = "elexis";

h2/pom.xml

@@ -26,7 +26,7 @@
       <plugins>
        <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>Create ${project.basedir}/target/results</id>

mysql/pom.xml

@@ -37,7 +37,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>Create ${project.basedir}/target/results</id>

pom.xml

@@ -6,17 +6,8 @@
   <version>0.1</version>
   <packaging>pom</packaging>
   <properties>
-    <tycho.version>4.0.13</tycho.version>
+    <tycho.version>4.0.12</tycho.version>
     <tycho-groupid>org.eclipse.tycho</tycho-groupid>
-    <!-- we need a version > 2.3.0 because we need the proc find-all to extract the language from the nl parameter
-    commit 265067eb1ce14428ea4d33e97606934a6238d9e8
-    Author: Alexander Dudaev <aleksandr.dudayev@xored.com>
-    Date:   Wed Jul 25 20:56:41 2018 +0700
-    Added new ECL Command "find-all"
-    -->
-    <!--rcptt-maven-version>2.4.0-20181219.003252-175</rcptt-maven-version-->
-    <!-- we do not need a snapshot version as they change too often rcptt-maven-version>2.4.0-SNAPSHOT</rcptt-maven-version !-->
-    <!--rcptt-maven-version>2.5.2-SNAPSHOT</rcptt-maven-version-->
     <rcptt-maven-version>2.5.5</rcptt-maven-version>
     <rcptt-resources>${user.home}/elexis/rcptt</rcptt-resources>
     <suite2run>SmokeTestSuite</suite2run>

postgresql/pom.xml

@@ -47,7 +47,7 @@
         <plugin>
         <groupId>org.eclipse.rcptt</groupId>
         <artifactId>rcptt-maven-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>${rcptt-maven-version}</version>
         <extensions>true</extensions>
         <configuration>
           <timeout>5402</timeout>

run_postgresql_3.12.sh

@@ -6,5 +6,5 @@ cd `dirname $0`
 # -Dsuite2run=QuickTestSuite
 # -DuseBranch=3.12
 set -v
-mvn -V --batch-mode clean install --settings=$PWD/postgresql/settings.xml -f $PWD/postgresql/pom.xml -DuseBranch=3.12 2>&1 | tee `basename --suffix=.sh $0`-3.log;
+mvn -V --batch-mode clean install --settings=$PWD/postgresql/settings.xml -f $PWD/postgresql/pom.xml -DuseBranch=3.12 2>&1 | tee mvn-`date '+%Y-%m-%d-%H-%M'`.log;
 echo done

run_test.fish

@@ -52,8 +52,7 @@ end
 set zip_file elexis-$branch/target/products/*zip
 echo zip_file is $zip_file
 set cmd mvn -V --batch-mode clean install --settings=$dbtype/settings.xml -f $dbtype/pom.xml -DuseBranch=$branch -Dlanguage=$language -DautExplicit=$autDir/Elexis3
-echo $cmd
-$cmd
+$cmd 2>&1 | tee mvn-(date '+%Y-%m-%d-%H-%M').log
 set result $status
 echo "Maven returned $result mit $status branch $_flag_branch"
 ls -lh Kernfunktionen/target/results/Kernfunktionen.html

setup/pom.xml

@@ -195,7 +195,7 @@
       </plugin>
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <id>copy-datafiles</id>