Updated commons-daemon to 1.2.3, boost to 1.74.0, and fixed some Java…

…8-isms
raytheonbbn · Oct 17, 2020 · b6298bd · b6298bd
1 parent 77d8c5e
commit b6298bd
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 85 deletions.
diff --git a/License/Parliament-ThirdPartyComponents.csv b/License/Parliament-ThirdPartyComponents.csv
@@ -1,6 +1,6 @@
 Application/Product,Developer/Company,Source (US/Foreign),org,name,rev,Dist. With,Top-Level?,Web Site,License,License URL
 Ant-Contrib,Matt Inger and Curt Arnold,US,ant-contrib,ant-contrib,1.0b3,Dependencies,Y,http://ant-contrib.sourceforge.net,Apache license 1.1,http://ant-contrib.sourceforge.net/tasks/LICENSE.txt
-Apache Commons Daemon,Apache Commons Project,Foreign?,commons-daemon,commons-daemon,1.1.0,Binaries,Y,http://commons.apache.org/proper/commons-daemon/,Apache license 2.0,http://www.apache.org/licenses/
+Apache Commons Daemon,Apache Commons Project,Foreign?,commons-daemon,commons-daemon,1.2.3,Binaries,Y,http://commons.apache.org/proper/commons-daemon/,Apache license 2.0,http://www.apache.org/licenses/
 Apache Commons DBCP,Apache Commons Project,Foreign?,commons-dbcp,commons-dbcp,1.4,Binaries,Y,http://commons.apache.org/proper/commons-dbcp/,Apache license 2.0,http://www.apache.org/licenses/
 Apache Commons FileUpload,Apache Commons Project,Foreign?,commons-fileupload,commons-fileupload,1.3.3,Binaries,Y,http://commons.apache.org/proper/commons-fileupload/,Apache license 2.0,http://www.apache.org/licenses/
 Berkeley DB,Oracle,US,,,5.3.28,"Dependencies, Binaries",Y,http://www.oracle.com/,Berkeley DB License (BSD-like),
@@ -36,4 +36,4 @@ PostgreSQL JDBC Driver,Planet PostgreSQL,Mixed,org.postgresql,postgresql,9.4.120
 Servlet API,Oracle,US,javax.servlet,javax.servlet-api,3.1.0,Binaries,Y,https://glassfish.dev.java.net/,CDDL + GPLv2 with classpath exception,https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
 Sesame,Eclipse Foundation,Foreign,org.openrdf,sesame,1.2.7,,Y,http://rdf4j.org/,LGPL,http://www.gnu.org/copyleft/lesser.html
 SLF4J (jcl-over-slf4j),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,jcl-over-slf4j,1.7.21,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
-SLF4J (slf4j-log4j12),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,slf4j-log4j12,1.7.21,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
+SLF4J (slf4j-log4j12),"SLF4J Project, Quality Open Software",Foreign (Swiss),org.slf4j,slf4j-log4j12,1.7.21,Binaries,Y,https://www.slf4j.org/,MIT,https://www.slf4j.org/license.html
diff --git a/Parliament/KbCore/Jamfile b/Parliament/KbCore/Jamfile
@@ -21,7 +21,6 @@ lib Parliament
 		/site-config//BoostHeaderOnlyLibraries
 		/site-config//BoostAtomic
 		/site-config//BoostChrono
-		/site-config//BoostDateTime
 		/site-config//BoostFileSystem
 		/site-config//BoostLog
 		/site-config//BoostLogSetup

diff --git a/Parliament/Test/Jamfile b/Parliament/Test/Jamfile
@@ -33,7 +33,6 @@ run [ glob *.cpp : UnicodeTestCaseGen.cpp ]
 		/site-config//BoostHeaderOnlyLibraries
 		/site-config//BoostAtomic/<link>static
 		/site-config//BoostChrono/<link>static
-		/site-config//BoostDateTime/<link>static
 		/site-config//BoostFileSystem/<link>static
 		/site-config//BoostLog/<link>static
 		/site-config//BoostLogSetup/<link>static

diff --git a/Parliament/build.xml b/Parliament/build.xml
@@ -254,11 +254,6 @@
 			<param name="callingBinary" value="libParliament.dylib"/>
 			<param name="calledBinary" value="libboost_chrono${boostLibSuffix}"/>
 		</antcall>
-		<antcall target="changeInstallName">
-			<param name="dylibDir" value="${dylibDir}"/>
-			<param name="callingBinary" value="libParliament.dylib"/>
-			<param name="calledBinary" value="libboost_date_time${boostLibSuffix}"/>
-		</antcall>
 		<antcall target="changeInstallName">
 			<param name="dylibDir" value="${dylibDir}"/>
 			<param name="callingBinary" value="libParliament.dylib"/>
@@ -295,11 +290,6 @@
 			<param name="callingBinary" value="libboost_log_setup${boostLibSuffix}"/>
 			<param name="calledBinary" value="libboost_chrono${boostLibSuffix}"/>
 		</antcall>
-		<antcall target="changeInstallName">
-			<param name="dylibDir" value="${dylibDir}"/>
-			<param name="callingBinary" value="libboost_log_setup${boostLibSuffix}"/>
-			<param name="calledBinary" value="libboost_date_time${boostLibSuffix}"/>
-		</antcall>
 		<antcall target="changeInstallName">
 			<param name="dylibDir" value="${dylibDir}"/>
 			<param name="callingBinary" value="libboost_log_setup${boostLibSuffix}"/>
@@ -331,11 +321,6 @@
 			<param name="callingBinary" value="libboost_log${boostLibSuffix}"/>
 			<param name="calledBinary" value="libboost_chrono${boostLibSuffix}"/>
 		</antcall>
-		<antcall target="changeInstallName">
-			<param name="dylibDir" value="${dylibDir}"/>
-			<param name="callingBinary" value="libboost_log${boostLibSuffix}"/>
-			<param name="calledBinary" value="libboost_date_time${boostLibSuffix}"/>
-		</antcall>
 		<antcall target="changeInstallName">
 			<param name="dylibDir" value="${dylibDir}"/>
 			<param name="callingBinary" value="libboost_log${boostLibSuffix}"/>
@@ -466,15 +451,15 @@
 			<arg value="&amp;"/>
 			<arg value="cd"/>
 			<arg value="/d"/>
-			<arg file="${untarPath}/src/native/windows/apps/prunsrv" prefix='"' suffix='"'/>
+			<arg file="${untarPath}/windows/apps/prunsrv" prefix='"' suffix='"'/>
 			<arg value="&amp;"/>
 			<arg value="nmake"/>
 			<arg value="${nmakeArg}"/>
 			<arg value='"'/>
 		</exec>
 
 		<copy todir="${targetDir}/${deployableSvrDir}/bin" overwrite="true" flatten="true">
-			<fileset dir="${untarPath}/src/native/windows/apps/prunsrv" includes="**/prunsrv.exe"/>
+			<fileset dir="${untarPath}/windows/apps/prunsrv" includes="**/prunsrv.exe"/>
 		</copy>
 		<move file="${targetDir}/${deployableSvrDir}/bin/prunsrv.exe"
 			tofile="${targetDir}/${deployableSvrDir}/bin/ParliamentService.exe"
@@ -496,22 +481,22 @@
 			<os family="mac"/>
 		</condition>
 
-		<chmod file="${untarPath}/src/native/unix/configure" perm="ugo+rx"
+		<chmod file="${untarPath}/unix/configure" perm="ugo+rx"
 			osfamily="unix" verbose="true"/>
-		<exec executable="./configure" dir="${untarPath}/src/native/unix">
+		<exec executable="./configure" dir="${untarPath}/unix">
 			<env key="CFLAGS" value="${flags}"/>
 			<env key="LDFLAGS" value="${flags}"/>
 			<env key="CC" value="${ccValue}"/>
 		</exec>
-		<exec executable="make" dir="${untarPath}/src/native/unix"/>
-		<move file="${untarPath}/src/native/unix/jsvc"
+		<exec executable="make" dir="${untarPath}/unix"/>
+		<move file="${untarPath}/unix/jsvc"
 			todir="${targetDir}/${deployableSvrDir}/bin"/>
 		<chmod file="${targetDir}/${deployableSvrDir}/bin/jsvc" perm="ugo+rx" verbose="true"/>
 
-		<ant dir="${untarPath}" target="jar" inheritAll="false"/>
+		<!-- ant dir="${untarPath}" target="jar" inheritAll="false"/>
 		<move todir="${targetDir}/${deployableSvrDir}/lib">
 			<fileset dir="${untarPath}/dist" includes="commons-daemon-*.jar"/>
-		</move>
+		</move -->
 
 		<delete dir="${daemonBinDir}"/>
 	</target>
@@ -525,7 +510,7 @@
 		</delete>
 
 		<for param="tarFile">
-			<fileset dir="${basedir}/lib/native" includes="**/commons-daemon-*.tar.gz"/>
+			<fileset dir="${basedir}/lib/default" includes="**/commons-daemon-*.tar.gz"/>
 			<sequential>
 				<untar src="@{tarFile}" dest="${daemonBinDir}" compression="gzip"/>
 			</sequential>
@@ -545,13 +530,13 @@
 				<and>
 					<os family="windows"/>
 					<uptodate targetfile="${targetDir}/${deployableSvrDir}/bin/ParliamentService.exe">
-						<srcfiles dir="${basedir}/lib/native" includes="commons-daemon-*.tar.gz"/>
+						<srcfiles dir="${basedir}/lib/default" includes="commons-daemon-*.tar.gz"/>
 					</uptodate>
 				</and>
 				<and>
 					<not><os family="windows"/></not>
 					<uptodate targetfile="${targetDir}/${deployableSvrDir}/bin/jsvc">
-						<srcfiles dir="${basedir}/lib/native" includes="commons-daemon-*.tar.gz"/>
+						<srcfiles dir="${basedir}/lib/default" includes="commons-daemon-*.tar.gz"/>
 					</uptodate>
 				</and>
 			</or>

diff --git a/Parliament/ivy.xml b/Parliament/ivy.xml
@@ -12,11 +12,11 @@
 		<conf name="default"/>
 		<conf name="test" extends="default" visibility="private"
 			description="for unit testing"/>
-		<conf name="native" visibility="private"
-			description="for Apache commons-daemon"/>
 	</configurations>
 
 	<dependencies>
+		<!-- dependency org="commons-daemon" name="commons-daemon" rev="1.2.3"
+			conf="default->default"/ -->
 		<dependency org="org.apache.jena" name="jena-arq" rev="2.9.4"
 			conf="default->default"/>
 		<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"
@@ -26,9 +26,11 @@
 		<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"
 			conf="default->default"/>
 
-		<dependency org="commons-daemon" name="commons-daemon" rev="1.1.0" conf="native->default">
+		<dependency org="commons-daemon" name="commons-daemon" rev="1.2.3" conf="default->default">
+			<artifact name="commons-daemon" type="jar"
+				url="https://repo1.maven.org/maven2/commons-daemon/commons-daemon/1.2.3/commons-daemon-1.2.3.jar"/>
 			<artifact name="commons-daemon" type="native-src" ext="tar.gz"
-				url="https://repo1.maven.org/maven2/commons-daemon/commons-daemon/1.1.0/commons-daemon-1.1.0-src.tar.gz"/>
+				url="https://repo1.maven.org/maven2/commons-daemon/commons-daemon/1.2.3/commons-daemon-1.2.3-native-src.tar.gz"/>
 		</dependency>
 
 		<!-- dependency org="junit" name="junit" rev="4.12" conf="test->default"/ -->

diff --git a/Sesame/Swrl2Sesame/ivy.xml b/Sesame/Swrl2Sesame/ivy.xml
@@ -12,5 +12,6 @@
 
 	<dependencies>
 		<dependency org="org.openrdf" name="sesame" rev="1.2.7" conf="default->default"/>
+		<dependency org="jakarta.xml.bind" name="jakarta.xml.bind-api" rev="2.3.3" conf="default->default"/>
 	</dependencies>
 </ivy-module>
diff --git a/doc/Linux/site-config.jam b/doc/Linux/site-config.jam
@@ -79,20 +79,6 @@ alias BoostChrono
 	:	<include>$(BoostDir)
 	;
 
-alias BoostDateTime
-	:	# no sources
-	:	$(Boost64DyDbgLibPfx)date_time$(Boost64DyDbgLibSfx)
-		$(Boost64DyRlsLibPfx)date_time$(Boost64DyRlsLibSfx)
-		$(Boost64StDbgLibPfx)date_time$(Boost64StDbgLibSfx)
-		$(Boost64StRlsLibPfx)date_time$(Boost64StRlsLibSfx)
-		$(Boost32DyDbgLibPfx)date_time$(Boost32DyDbgLibSfx)
-		$(Boost32DyRlsLibPfx)date_time$(Boost32DyRlsLibSfx)
-		$(Boost32StDbgLibPfx)date_time$(Boost32StDbgLibSfx)
-		$(Boost32StRlsLibPfx)date_time$(Boost32StRlsLibSfx)
-	:	# no default build
-	:	<include>$(BoostDir)
-	;
-
 alias BoostFileSystem
 	:	# no sources
 	:	$(Boost64DyDbgLibPfx)filesystem$(Boost64DyDbgLibSfx)

diff --git a/doc/MacOS/site-config.jam b/doc/MacOS/site-config.jam
@@ -55,16 +55,6 @@ alias BoostChrono
 	:	<include>$(BoostDir)
 	;
 
-alias BoostDateTime
-	:	# no sources
-	:	$(BoostDyDbgLibPfx)date_time$(BoostDyDbgLibSfx)
-		$(BoostDyRlsLibPfx)date_time$(BoostDyRlsLibSfx)
-		$(BoostStDbgLibPfx)date_time$(BoostStDbgLibSfx)
-		$(BoostStRlsLibPfx)date_time$(BoostStRlsLibSfx)
-	:	# no default build
-	:	<include>$(BoostDir)
-	;
-
 alias BoostFileSystem
 	:	# no sources
 	:	$(BoostDyDbgLibPfx)filesystem$(BoostDyDbgLibSfx)

diff --git a/doc/UserGuide/Building.tex b/doc/UserGuide/Building.tex
@@ -136,15 +136,15 @@ \section{Building the Boost Libraries}
 We aim to establish ``existing practice'' and provide reference implementations so that Boost libraries are suitable for eventual standardization. Ten Boost libraries are already included in the \href{http://www.open-std.org/jtc1/sc22/wg21/}{C++ Standards Committee's} Library Technical Report (\href{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1745.pdf}{TR1}) and in the new C++11 Standard.  C++11 also includes several more Boost libraries in addition to those from TR1.  More Boost libraries are proposed for standardization in C++17.
 \end{quote}
 
-To get started, download the Boost source distribution (version 1.69.0 or later) from the Boost web site.  Unpack this to a handy location on your disk.  This location may be anywhere you like.  Define this environment variable pointing there:
+To get started, download the Boost source distribution (version 1.74.0 or later) from the Boost web site.  Unpack this to a handy location on your disk.  This location may be anywhere you like.  Define this environment variable pointing there:
 
 {
 	%\renewcommand{\arraystretch}{1.5}
 	\renewcommand{\tabcolsep}{0pt}
 	\begin{tabular}{l@{\hspace{2em}}l}
-		\verb|set BOOST_ROOT=C:\boost_1_69_0|
+		\verb|set BOOST_ROOT=C:\boost_1_74_0|
 			& (on Windows)\\
-		\verb|export BOOST_ROOT=~/boost_1_69_0|
+		\verb|export BOOST_ROOT=~/boost_1_74_0|
 			& (on Macintosh and Linux)\\
 	\end{tabular}
 }
@@ -243,7 +243,7 @@ \section{Configuring Boost.Build}
 
 	\item\verb|BDB_HOME|: As described above in Section~\ref{sec:BuildingBerkeleyDB}.
 
-	\item\verb|BOOST_VERSION|: The version of Boost (currently 1\_69\_0).
+	\item\verb|BOOST_VERSION|: The version of Boost (currently 1\_74\_0).
 
 	\item\verb|BOOST_ROOT|: As described above in Section~\ref{sec:BuildingBoost}.
 

diff --git a/doc/UserGuide/Introduction.tex b/doc/UserGuide/Introduction.tex
@@ -12,7 +12,7 @@ \chapter{Introduction to \acl{pmnt}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Background}
 
-The Semantic Web employs a different data model than a relational database.  A relational database stores data in tables (rows and columns) while \ac{rdf}\urlcite{http://www.w3.org/RDF/} represents data as a directed graph of ordered triples of the form (subject, predicate, object).  Accordingly, a Semantic Web data store is often called a semantic graph, graph store, knowledge base, or triple store.
+The Semantic Web employs a different data model than a relational database.  A relational database stores data in tables (rows and columns) while \ac{rdf}\urlcite{http://www.w3.org/RDF/} represents data as a directed graph of ordered triples of the form (subject, predicate, object).  Accordingly, a Semantic Web data store is often called a semantic graph, triple store, knowledge base, or graph store.
 
 A relational database can store a directed graph, and some graph stores are in fact implemented as a thin interface layer wrapping a relational database.  However, the query performance of such implementations is usually poor.  This is because the only straightforward way to store the graph with the required level of generality is to use a single table to store all the triples, and this schema tends to defeat relational query optimizers.
 

diff --git a/doc/UserGuide/TitlePage.tex b/doc/UserGuide/TitlePage.tex
@@ -33,7 +33,7 @@
 
 	\vfill
 
-	\textit{Copyright © 2001-2019,\\
+	\textit{Copyright © 2001-2020,\\
 	\acl{bbn}, Inc.\\
 	All rights reserved.}
 

diff --git a/doc/Windows/site-config.jam b/doc/Windows/site-config.jam
@@ -90,24 +90,6 @@ alias BoostChrono
 		<dll-path>$(BoostLibDir)
 	;
 
-alias BoostDateTime
-	:	# no sources
-	:	$(Boost64DyDbgLibPfx)date_time$(Boost64DyDbgLibSfx)
-		$(Boost64DyRlsLibPfx)date_time$(Boost64DyRlsLibSfx)
-		$(Boost64StDbgLibPfx)date_time$(Boost64StDbgLibSfx)
-		$(Boost64StRlsLibPfx)date_time$(Boost64StRlsLibSfx)
-		$(Boost32DyDbgLibPfx)date_time$(Boost32DyDbgLibSfx)
-		$(Boost32DyRlsLibPfx)date_time$(Boost32DyRlsLibSfx)
-		$(Boost32StDbgLibPfx)date_time$(Boost32StDbgLibSfx)
-		$(Boost32StRlsLibPfx)date_time$(Boost32StRlsLibSfx)
-	:	# no default build
-	:	<include>$(BoostDir)
-		<link>shared:<define>BOOST_DATE_TIME_DYN_LINK
-		<define>_SCL_SECURE_NO_WARNINGS
-		<library-path>$(BoostLibDir)
-		<dll-path>$(BoostLibDir)
-	;
-
 alias BoostFileSystem
 	:	# no sources
 	:	$(Boost64DyDbgLibPfx)filesystem$(Boost64DyDbgLibSfx)

diff --git a/...dexProcessor/src/com/bbn/parliament/jena/graph/index/temporal/TemporalExtentIterator.java b/...dexProcessor/src/com/bbn/parliament/jena/graph/index/temporal/TemporalExtentIterator.java
@@ -14,8 +14,6 @@
 import com.bbn.parliament.jena.graph.index.temporal.extent.TemporalInstant;
 import com.hp.hpl.jena.util.iterator.ClosableIterator;
 
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
 /** @author dkolas */
 public class TemporalExtentIterator implements ClosableIterator<Record<TemporalExtent>> {
 	private InclusionDecider inclusionDecider;
@@ -56,7 +54,7 @@ public Record<TemporalExtent> next() {
 
 	@Override
 	public void remove() {
-		throw new NotImplementedException();
+		throw new UnsupportedOperationException();
 	}
 
 	@Override