Update for blosc2 in plugins and prefix hdf5 cmake varnames (#4468)

java/test/junit.sh.in

@@ -351,8 +351,6 @@ TESTING JUnit-TestH5
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5.ext > JUnit-TestH5.out
 
 if diff JUnit-TestH5.out JUnit-TestH5.txt > /dev/null; then
@@ -372,8 +370,6 @@ TESTING JUnit-TestH5Eparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Eparams.ext > JUnit-TestH5Eparams.out
 
 if diff JUnit-TestH5Eparams.out JUnit-TestH5Eparams.txt > /dev/null; then
@@ -393,8 +389,6 @@ TESTING JUnit-TestH5Eregister
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Eregister.ext > JUnit-TestH5Eregister.out
 
 if diff JUnit-TestH5Eregister.out JUnit-TestH5Eregister.txt > /dev/null; then
@@ -414,8 +408,6 @@ TESTING JUnit-TestH5Fparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Fparams.ext > JUnit-TestH5Fparams.out
 
 if diff JUnit-TestH5Fparams.out JUnit-TestH5Fparams.txt > /dev/null; then
@@ -435,8 +427,6 @@ TESTING JUnit-TestH5Fbasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Fbasic.ext > JUnit-TestH5Fbasic.out
 
 if diff JUnit-TestH5Fbasic.out JUnit-TestH5Fbasic.txt > /dev/null; then
@@ -456,8 +446,6 @@ TESTING JUnit-TestH5F
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5F.ext > JUnit-TestH5F.out
 
 if diff JUnit-TestH5F.out JUnit-TestH5F.txt > /dev/null; then
@@ -477,8 +465,6 @@ TESTING JUnit-TestH5Fswmr
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Fswmr.ext > JUnit-TestH5Fswmr.out
 
 if diff JUnit-TestH5Fswmr.out JUnit-TestH5Fswmr.txt > /dev/null; then
@@ -498,8 +484,6 @@ TESTING JUnit-TestH5Gbasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Gbasic.ext > JUnit-TestH5Gbasic.out
 
 if diff JUnit-TestH5Gbasic.out JUnit-TestH5Gbasic.txt > /dev/null; then
@@ -519,8 +503,6 @@ TESTING JUnit-TestH5G
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5G.ext > JUnit-TestH5G.out
 
 if diff JUnit-TestH5G.out JUnit-TestH5G.txt > /dev/null; then
@@ -540,8 +522,6 @@ TESTING JUnit-TestH5Sbasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Sbasic.ext > JUnit-TestH5Sbasic.out
 
 if diff JUnit-TestH5Sbasic.out JUnit-TestH5Sbasic.txt > /dev/null; then
@@ -561,8 +541,6 @@ TESTING JUnit-TestH5S
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5S.ext > JUnit-TestH5S.out
 
 if diff JUnit-TestH5S.out JUnit-TestH5S.txt > /dev/null; then
@@ -582,8 +560,6 @@ TESTING JUnit-TestH5Tparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Tparams.ext > JUnit-TestH5Tparams.out
 
 if diff JUnit-TestH5Tparams.out JUnit-TestH5Tparams.txt > /dev/null; then
@@ -603,8 +579,6 @@ TESTING JUnit-TestH5Tbasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Tbasic.ext > JUnit-TestH5Tbasic.out
 
 if diff JUnit-TestH5Tbasic.out JUnit-TestH5Tbasic.txt > /dev/null; then
@@ -624,8 +598,6 @@ TESTING JUnit-TestH5T
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5T.ext > JUnit-TestH5T.out
 
 if diff JUnit-TestH5T.out JUnit-TestH5T.txt > /dev/null; then
@@ -645,8 +617,6 @@ TESTING JUnit-TestH5Dparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Dparams.ext > JUnit-TestH5Dparams.out
 
 if diff JUnit-TestH5Dparams.out JUnit-TestH5Dparams.txt > /dev/null; then
@@ -666,8 +636,6 @@ TESTING JUnit-TestH5D
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5D.ext > JUnit-TestH5D.out
 
 if diff JUnit-TestH5D.out JUnit-TestH5D.txt > /dev/null; then
@@ -687,8 +655,6 @@ TESTING JUnit-TestH5Drw
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Drw.ext > JUnit-TestH5Drw.out
 
 if diff JUnit-TestH5Drw.out JUnit-TestH5Drw.txt > /dev/null; then
@@ -708,8 +674,6 @@ TESTING JUnit-TestH5Dplist
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Dplist.ext > JUnit-TestH5Dplist.out
 
 if diff JUnit-TestH5Dplist.out JUnit-TestH5Dplist.txt > /dev/null; then
@@ -729,8 +693,6 @@ TESTING JUnit-TestH5Lparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Lparams.ext > JUnit-TestH5Lparams.out
 
 if diff JUnit-TestH5Lparams.out JUnit-TestH5Lparams.txt > /dev/null; then
@@ -750,8 +712,6 @@ TESTING JUnit-TestH5Lbasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Lbasic.ext > JUnit-TestH5Lbasic.out
 
 if diff JUnit-TestH5Lbasic.out JUnit-TestH5Lbasic.txt > /dev/null; then
@@ -771,8 +731,6 @@ TESTING JUnit-TestH5Lcreate
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Lcreate.ext > JUnit-TestH5Lcreate.out
 
 if diff JUnit-TestH5Lcreate.out JUnit-TestH5Lcreate.txt > /dev/null; then
@@ -792,8 +750,6 @@ TESTING JUnit-TestH5R
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5R.ext > JUnit-TestH5R.out
 
 if diff JUnit-TestH5R.out JUnit-TestH5R.txt > /dev/null; then
@@ -813,8 +769,6 @@ TESTING JUnit-TestH5Rref
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Rref.ext > JUnit-TestH5Rref.out
 
 if diff JUnit-TestH5Rref.out JUnit-TestH5Rref.txt > /dev/null; then
@@ -834,8 +788,6 @@ TESTING JUnit-TestH5P
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5P.ext > JUnit-TestH5P.out
 
 if diff JUnit-TestH5P.out JUnit-TestH5P.txt > /dev/null; then
@@ -855,8 +807,6 @@ TESTING JUnit-TestH5PData
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5PData.ext > JUnit-TestH5PData.out
 
 if diff JUnit-TestH5PData.out JUnit-TestH5PData.txt > /dev/null; then
@@ -876,8 +826,6 @@ TESTING JUnit-TestH5Pfapl
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Pfapl.ext > JUnit-TestH5Pfapl.out
 
 if diff JUnit-TestH5Pfapl.out JUnit-TestH5Pfapl.txt > /dev/null; then
@@ -897,8 +845,6 @@ TESTING JUnit-TestH5Pvirtual
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Pvirtual.ext > JUnit-TestH5Pvirtual.out
 
 if diff JUnit-TestH5Pvirtual.out JUnit-TestH5Pvirtual.txt > /dev/null; then
@@ -918,8 +864,6 @@ TESTING JUnit-TestH5Plist
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Plist.ext > JUnit-TestH5Plist.out
 
 if diff JUnit-TestH5Plist.out JUnit-TestH5Plist.txt > /dev/null; then
@@ -939,8 +883,6 @@ TESTING JUnit-TestH5A
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5A.ext > JUnit-TestH5A.out
 
 if diff JUnit-TestH5A.out JUnit-TestH5A.txt > /dev/null; then
@@ -960,8 +902,6 @@ TESTING JUnit-TestH5Arw
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Arw.ext > JUnit-TestH5Arw.out
 
 if diff JUnit-TestH5Arw.out JUnit-TestH5Arw.txt > /dev/null; then
@@ -981,8 +921,6 @@ TESTING JUnit-TestH5Oparams
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Oparams.ext > JUnit-TestH5Oparams.out
 
 if diff JUnit-TestH5Oparams.out JUnit-TestH5Oparams.txt > /dev/null; then
@@ -1002,8 +940,6 @@ TESTING JUnit-TestH5Obasic
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Obasic.ext > JUnit-TestH5Obasic.out
 
 if diff JUnit-TestH5Obasic.out JUnit-TestH5Obasic.txt > /dev/null; then
@@ -1023,8 +959,6 @@ TESTING JUnit-TestH5Ocreate
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Ocreate.ext > JUnit-TestH5Ocreate.out
 
 if diff JUnit-TestH5Ocreate.out JUnit-TestH5Ocreate.txt > /dev/null; then
@@ -1044,8 +978,6 @@ TESTING JUnit-TestH5OcopyOld
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5OcopyOld.ext > JUnit-TestH5OcopyOld.out
 
 if diff JUnit-TestH5OcopyOld.out JUnit-TestH5OcopyOld.txt > /dev/null; then
@@ -1065,8 +997,6 @@ TESTING JUnit-TestH5Ocopy
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Ocopy.ext > JUnit-TestH5Ocopy.out
 
 if diff JUnit-TestH5Ocopy.out JUnit-TestH5Ocopy.txt > /dev/null; then
@@ -1086,8 +1016,6 @@ TESTING JUnit-TestH5PL
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5PL.ext > JUnit-TestH5PL.out
 
 if diff JUnit-TestH5PL.out JUnit-TestH5PL.txt > /dev/null; then
@@ -1107,8 +1035,6 @@ TESTING JUnit-TestH5VL
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5VL.ext > JUnit-TestH5VL.out
 
 if diff JUnit-TestH5VL.out JUnit-TestH5VL.txt > /dev/null; then
@@ -1128,8 +1054,6 @@ TESTING JUnit-TestH5Z
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Z.ext > JUnit-TestH5Z.out
 
 if diff JUnit-TestH5Z.out JUnit-TestH5Z.txt > /dev/null; then
@@ -1149,8 +1073,6 @@ TESTING JUnit-TestH5E
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5E.ext > JUnit-TestH5E.out
 
 if diff JUnit-TestH5E.out JUnit-TestH5E.txt > /dev/null; then
@@ -1170,8 +1092,6 @@ TESTING JUnit-TestH5Edefault
 sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
     -e 's/line [0-9]*/line (number)/' \
     -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-    -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-    -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
     JUnit-TestH5Edefault.ext > JUnit-TestH5Edefault.out
 
 if diff JUnit-TestH5Edefault.out JUnit-TestH5Edefault.txt > /dev/null; then
@@ -1192,8 +1112,6 @@ if test $USE_FILTER_SZIP = "yes"; then
     sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
         -e 's/line [0-9]*/line (number)/' \
         -e 's/Time: [0-9]*[\.,[0-9]*]*/Time:  XXXX/' \
-        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         JUnit-TestH5Giterate.ext > JUnit-TestH5Giterate.out
 
     if diff JUnit-TestH5Giterate.out JUnit-TestH5Giterate.txt > /dev/null; then
@@ -1214,8 +1132,6 @@ if test "X$ROS3_VFD" = "Xyes"; then
     sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
         -e 's/line [0-9]*/line (number)/' \
         -e 's/Time: [0-9]*\.,[0-9]*/Time:  XXXX/' \
-        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         JUnit-TestH5Pfapls3.ext > JUnit-TestH5Pfapls3.out
 
     if diff JUnit-TestH5Pfapls3.out JUnit-TestH5Pfapls3.txt > /dev/null; then
@@ -1236,8 +1152,6 @@ if test "X$HAVE_LIBHDFS" = "Xyes"; then
     sed -e 's/ thread [0-9]*//' -e 's/: .*\.c /: (file name) /' \
         -e 's/line [0-9]*/line (number)/' \
         -e 's/Time: [0-9]*\.,[0-9]*/Time:  XXXX/' \
-        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         JUnit-TestH5Pfaplhdfs.ext > JUnit-TestH5Pfaplhdfs.out
 
     if diff JUnit-TestH5Pfaplhdfs.out JUnit-TestH5Pfaplhdfs.txt > /dev/null; then

java/test/testfiles/JUnit-TestH5.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5get_libversion_null_param
 .testJ2C
 .testIsSerializable

java/test/testfiles/JUnit-TestH5A.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Acreate2_nullname
 .testH5Acreate_by_name
 .testH5Aget_name_by_idx

java/test/testfiles/JUnit-TestH5Arw.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Aread_128bit_floats
 .testH5Aread_64bit_floats
 .testH5Aread_8bit_ints

java/test/testfiles/JUnit-TestH5D.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5DArrayenum_rw
 .testH5DVLwrVL
 .testH5Dget_storage_size

java/test/testfiles/JUnit-TestH5Dparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Dget_space_status_invalid
 .testH5Dget_access_plist_invalid
 .testH5Dget_type_invalid

java/test/testfiles/JUnit-TestH5Dplist.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5P_dset_no_attrs_hint
 .testH5Dset_extent
 

java/test/testfiles/JUnit-TestH5Drw.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Dread_32bit_floats
 .testH5Dread_32bit_ints
 .testH5Dread_64bit_ints

java/test/testfiles/JUnit-TestH5E.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Eget_msg_major
 .testH5Eget_msg_minor
 .testH5Epush

java/test/testfiles/JUnit-TestH5Edefault.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Eset_current_stack_invalid_stkid
 .testH5Eset_current_stack
 .testH5Eget_num

java/test/testfiles/JUnit-TestH5Eparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5EprintInt
 .testH5Eget_msg
 .testH5Eget_num

java/test/testfiles/JUnit-TestH5Eregister.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Eregister_class_lib_name_null
 .testH5Eregister_class_version_null
 .testH5Eunregister_class_invalid_classid

java/test/testfiles/JUnit-TestH5F.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Fget_access_plist
 .testH5Fget_fileno_diff
 .testH5Fget_fileno_same

java/test/testfiles/JUnit-TestH5Fbasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Fget_mdc_size
 .testH5Fget_mdc_hit_rate
 .testH5F_dset_no_attrs_hint

java/test/testfiles/JUnit-TestH5Fparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Fis_accessible_null
 .testH5Fcreate_null
 .testH5Fflush_local

java/test/testfiles/JUnit-TestH5Fswmr.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Fstart_swmr_write
 .testH5Fswmr_read_attempts
 

java/test/testfiles/JUnit-TestH5G.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Gget_info_by_name
 .testH5Gget_create_plist
 .testH5Gopen

java/test/testfiles/JUnit-TestH5Gbasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Gget_info_by_name_not_exists
 .testH5Gget_info_by_idx_not_exists
 .testH5Gget_info_by_name

java/test/testfiles/JUnit-TestH5Giterate.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Gget_obj_info_all
 
 Time:  XXXX

java/test/testfiles/JUnit-TestH5Lbasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Lget_info_by_idx_not_exist_name
 .testH5Lget_name_by_idx_not_exist
 .testH5Lvisit

java/test/testfiles/JUnit-TestH5Lcreate.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Lget_info_by_idx_n0_create
 .testH5Ldelete_soft_link_dangle
 .testH5Lget_value_by_idx_external_create

java/test/testfiles/JUnit-TestH5Lparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Lcopy_invalid
 .testH5Lget_value_by_idx_null
 .testH5Lcreate_external_invalid

java/test/testfiles/JUnit-TestH5Obasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Oexists_by_name
 .testH5Oget_native_info_dataset
 .testH5Oopen_by_token

java/test/testfiles/JUnit-TestH5Ocopy.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5OcopyRefsDatasettosameFile
 .testH5OcopyNullRef
 .testH5OcopyRefsDatasettodiffFile

java/test/testfiles/JUnit-TestH5OcopyOld.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5OcopyRefsDatasettosameFile
 .testH5OcopyNullRef
 .testH5OcopyRefsDatasettodiffFile

java/test/testfiles/JUnit-TestH5Ocreate.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Oget_info_by_idx_n0_create
 .testH5Oget_info_softlink_dangle
 .testH5Oget_info_softlink

java/test/testfiles/JUnit-TestH5Oparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Oget_comment_by_name_null
 .testH5Oget_native_info_by_name_invalid
 .testH5Ovisit_by_name_nullname

java/test/testfiles/JUnit-TestH5P.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Pset_nbit
 .testH5Pset_shared_mesg_index_InvalidFlag
 .testH5Pset_shared_mesg_phase_change

java/test/testfiles/JUnit-TestH5PData.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5P_buffer
 .testH5Pdata_transform
 

java/test/testfiles/JUnit-TestH5PL.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .TestH5PLplugins
 .TestH5PLpaths
 

java/test/testfiles/JUnit-TestH5Pfapl.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5P_elink_fapl
 .testH5P_fapl_direct
 .testH5P_alignment

java/test/testfiles/JUnit-TestH5Pfaplhdfs.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Pget_fapl_hdfs_invalid_fapl_id
 .testH5Pget_fapl_hdfs_fapl_id_of_wrong_driver_type
 .testHDFS_fapl

java/test/testfiles/JUnit-TestH5Pfapls3.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Pset_fapl_ros3_specified
 .testH5Pset_fapl_ros3
 .testH5Pget_fapl_ros3_invalid_fapl_id

java/test/testfiles/JUnit-TestH5Plist.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5P_genprop_basic_class
 .testH5P_genprop_class_iter
 .testH5P_genprop_basic_class_prop

java/test/testfiles/JUnit-TestH5Pvirtual.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Pget_source_datasetname
 .testH5Pvirtual_storage
 .testH5Pget_selection_source_dataset

java/test/testfiles/JUnit-TestH5R.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Ropen_attr_Nullref
 .testH5Rget_attr_name_Nullref
 .testH5Ropen_region_Nullref

java/test/testfiles/JUnit-TestH5Rref.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Rget_region_dataset
 .testH5Rget_object
 .testH5Rget_region_attribute

java/test/testfiles/JUnit-TestH5S.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Sget_select_npoints
 .testH5Sget_select_type
 .testH5Sset_extent_simple

java/test/testfiles/JUnit-TestH5Sbasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Sclose_invalid
 .testH5Screate_simple_max_default
 .testH5Screate_simple_dims_null

java/test/testfiles/JUnit-TestH5T.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Tvlen_create
 .testH5Tenum_create_functions
 .testH5Tenum_functions

java/test/testfiles/JUnit-TestH5Tbasic.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Tequal_not
 .testH5Tcopy
 .testH5Tequal

java/test/testfiles/JUnit-TestH5Tparams.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Tget_member_type_invalid
 .testH5Treclaim_invalid
 .testH5Tenum_insert_null

java/test/testfiles/JUnit-TestH5VL.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5VLget_connector_id_by_name
 .testH5VLget_connector_id_by_value
 .testH5VLget_connector_id

java/test/testfiles/JUnit-TestH5Z.txt

@@ -1,4 +1,4 @@
-JUnit version 4.11
+JUnit version 4.13.2
 .testH5Zfilter_avail
 .testH5Zunregister_predefined
 .testH5Zget_filter_info