Merge branch 'master' of github.com:bst-mug/trec-pm

hpi-dhc · Feb 18, 2019 · 737a67b · 737a67b
2 parents ae81d97 + 2e4dc8f
commit 737a67b
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,18 +66,17 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${project.build.directory}/lib"/>
+                                <mkdir dir="${project.build.directory}/lib" />
 
-                                <!-- We're affected by https://github.com/usnistgov/trec_eval/issues/14 on GCC-7 -->
-                                <get src="https://github.com/bgamari/trec_eval/archive/8c56e931127d53cff52945ca7d07c5270c190da1.zip"
-                                     dest="${project.build.directory}/lib/trec_eval_patched.zip"
-                                     verbose="false" usetimestamp="true"/>
-                                <unzip src="${project.build.directory}/lib/trec_eval_patched.zip"
-                                       dest="${project.build.directory}/lib/"/>
+                                <get src="https://github.com/usnistgov/trec_eval/archive/v9.0.6.zip"
+                                    dest="${project.build.directory}/lib/trec_eval-9.0.6.zip"
+                                    verbose="false" usetimestamp="true" />
+                                <unzip src="${project.build.directory}/lib/trec_eval-9.0.6.zip"
+                                    dest="${project.build.directory}/lib/"/>
                                 <exec executable="make" failonerror="true"
-                                      dir="${project.build.directory}/lib/trec_eval-8c56e931127d53cff52945ca7d07c5270c190da1/"/>
-                                <move file="${project.build.directory}/lib/trec_eval-8c56e931127d53cff52945ca7d07c5270c190da1/trec_eval"
-                                      tofile="${project.build.directory}/lib/trec_eval"/>
+                                    dir="${project.build.directory}/lib/trec_eval-9.0.6/" />
+                                <move file="${project.build.directory}/lib/trec_eval-9.0.6/trec_eval"
+                                      tofile="${project.build.directory}/lib/trec_eval" />
 
                                 <get src="https://web.archive.org/web/20170514010604if_/http://trec.nist.gov:80/data/clinical/sample_eval.pl"
                                      dest="${project.build.directory}/lib/sample_eval.pl"