Merge branch 'master' of https://github.com/jyrkioraskari/IFCtoLBD

IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.component

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+                                                                                                                                                                                    
 
 
 
@@ -40,8 +40,14 @@
 
 
 
-    <wb-module deploy-name="IFCProps2ExcelOnline-2.43.4">
-
+
+
+
+    <wb-module deploy-name="IFCProps2ExcelOnline-2.44.0">
+
+
+
+
 
 
 
@@ -83,7 +89,7 @@
 
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+                                                                                                                                                                                                                                                                                                                                                                        
 
 
 
@@ -124,11 +130,11 @@
 
 
 
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-
 
 
 
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+
 
 
 
@@ -166,14 +172,14 @@
 
 
 
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-
 
 
 
 
 
 
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+
 
 
 
@@ -208,8 +214,6 @@
 
 
 
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-
 
 
 
@@ -219,17 +223,21 @@
 
 
 
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
-        <dependent-module archiveName="ifc-to-lbd-2.43.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
+        <dependent-module archiveName="ifc-to-lbd-2.44.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="ifc_to_lbd_geometry-2.43.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
+        <dependent-module archiveName="ifc_to_lbd_geometry-2.44.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="ifc2rdf-1.3.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFC2RDF/IFC2RDF">
+        <dependent-module archiveName="ifc2rdf-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFC2RDF/IFC2RDF">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-
+
+
+
+
 
 
 
@@ -271,7 +279,10 @@
 
 
         <property name="java-output-path" value="/mvdXMLOnlineChecker/target/classes"/>
-
+
+
+
+
 
 
 
@@ -313,7 +324,10 @@
 
 
         <property name="component.exclusion.patterns" value="WEB-INF/classes/VAADIN/widgetsets/WEB-INF/**"/>
-
+
+
+
+
 
 
 
@@ -347,7 +361,10 @@
 
 
         <property name="context-root" value="IFCProps2ExcelOnline"/>
-
+
+
+
+
 
 
 
@@ -389,7 +406,10 @@
 
 
     </wb-module>
-
+
+
+
+
 
 
 

IFCProps2ExcelOnline/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,5 +4,5 @@
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.1"/>
   <installed facet="java" version="17"/>
-  <installed facet="jst.web" version="3.0"/>
+  <installed facet="jst.web" version="3.1"/>
 </faceted-project>

IFCProps2ExcelOnline/pom.xml

@@ -5,7 +5,7 @@
 	<groupId>de.rwth-aachen.dc.lbd</groupId>
 	<artifactId>IFCProps2ExcelOnline</artifactId>
 	<packaging>war</packaging>
-	<version>2.43.4</version>
+	<version>2.44.0</version>
 	<name>IFC Properties to Excel User Interface</name>
 
 	<properties>
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.5</version>
+			<version>2.44.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>

IFCtoLBD/.classpath

@@ -31,7 +31,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>

IFCtoLBD/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jyrkioraskari</groupId>
 	<artifactId>ifc-to-lbd</artifactId>
-	<version>2.43.5</version>
+	<version>2.44.0</version>
 	<name>IFC to LBD Converter</name>
 	<licenses>
 		<license>
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>de.rwth-aachen.lbd</groupId>
 			<artifactId>ifc_to_lbd_geometry</artifactId>
-			<version>2.43.5</version>
+			<version>2.44.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -83,84 +83,148 @@
 			</exclusions>
 		</dependency>
 
+		<!-- Dependency for Apache Commons Lang library -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.14.0</version>
+			<version>3.16.0</version>
+			<!-- URL for the Apache Commons Lang project:
+			https://commons.apache.org/proper/commons-lang/ -->
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+
+		<!-- Dependency for Apache Commons Codec library -->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.16.0</version>
+			<version>1.17.1</version>
+			<!-- URL for the Apache Commons Codec project:
+			https://commons.apache.org/proper/commons-codec/ -->
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
+
+		<!-- Dependency for XStream library -->
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 			<version>[1.4.14-jdk7,)</version>
+			<!-- URL for the XStream project: https://x-stream.github.io/ -->
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+
+		<!-- Dependency for Google Guava library -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>[30.0-jre,)</version>
+			<!-- URL for the Google Guava project:
+			https://github.com/google/guava -->
 		</dependency>
+
+		<!-- Dependency for JUnit Jupiter API library -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.10.1</version>
+			<version>5.11.0</version>
+			<!-- Scope of the dependency, used only for testing -->
 			<scope>test</scope>
+			<!-- URL for the JUnit Jupiter project: https://junit.org/junit5/ -->
 		</dependency>
+
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<version>1.10.1</version>
+			<version>1.11.0</version>
 			<scope>test</scope>
 		</dependency>
+
+
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
 			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
+
+
+		<!-- Dependency for IFCtoRDF library -->
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc2rdf</artifactId>
-			<version>1.3.2</version>
+			<version>1.4.0</version>
 		</dependency>
+
+		<!-- Dependency for RTree-Multi library -->
 		<dependency>
 			<groupId>com.github.davidmoten</groupId>
 			<artifactId>rtree-multi</artifactId>
 			<version>0.1</version>
+			<!-- URL for the RTree-Multi project:
+			https://github.com/davidmoten/rtree-multi -->
+			<!-- This library provides an in-memory immutable R-tree
+			implementation for n dimensions, commonly used for spatial indexing.
+			 It is thread-safe, fast, and memory
+			efficient. -->
 		</dependency>
+
+		<!-- Dependency for Picocli library -->
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
-			<version>4.7.5</version>
+			<version>4.7.6</version>
+			<!-- URL for the Picocli project: https://picocli.info -->
+			<!-- Picocli is a framework for creating Java command line
+			applications with almost zero code. It provides command line parsing,
+			autocompletion, and usage help with ANSI
+			styles and colors. -->
 		</dependency>
+
+
+		<!-- Dependency for Apache Commons Text library -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>1.11.0</version>
+			<version>1.12.0</version>
+			<!-- URL for the Apache Commons Text project:
+			https://commons.apache.org/proper/commons-text/ -->
+			<!-- Apache Commons Text is a library focused on algorithms working
+			on strings,providing utilities for text manipulation and processing. -->
 		</dependency>
+
+		<!-- Dependency for Apache Jena Shaded Guava library -->
 		<dependency>
 			<groupId>org.apache.jena</groupId>
 			<artifactId>jena-shaded-guava</artifactId>
 			<version>4.8.0</version>
+			<!-- URL for the Apache Jena Shaded Guava project:
+			https://central.sonatype.com/artifact/org.apache.jena/jena-shaded-guava -->
+			<!-- This library shades Google's Guava to avoid version conflicts,
+             providing a repackaged version under the org.apache.jena.ext.com.google
+			package. uava is a set of core Java libraries from Google that includes new
+			collection types 
+			(such as multimap and multiset), immutable collections, -->
 		</dependency>
-		<!--
-		https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+
+
+		<!-- Dependency for Jackson Databind library -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.16.1</version>
+			<version>2.17.2</version>
+			<!-- URL for the Jackson Databind project:
+			https://github.com/FasterXML/jackson-databind -->
+			<!-- Jackson Databind is used for converting Java objects to and
+			from JSON, providing data-binding functionality and tree-model 
+			for JSON processing. -->
 		</dependency>
 
+		<!-- Dependency for Apache Commons Geometry Core library -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-geometry-core</artifactId>
 			<version>1.0</version>
+			<!-- URL for the Apache Commons Geometry project:
+			https://commons.apache.org/proper/commons-geometry/ -->
+			<!-- Apache Commons Geometry Core is a library for geometric
+			processing, providing types and utilities for working with Euclidean 
+			and spherical spaces. -->
 		</dependency>
 
 		<dependency>
@@ -174,6 +238,7 @@
 			<artifactId>commons-geometry-io-core</artifactId>
 			<version>1.0</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-geometry-io-euclidean</artifactId>
@@ -403,5 +468,5 @@
 			<url>https://maven.pkg.github.com/jyrkioraskari/IFCtoLBD</url>
 		</repository>
 	</distributionManagement>
-	
+
 </project>

IFCtoLBD/src/license/THIRD-PARTY.properties

@@ -43,7 +43,6 @@
 # - MIT License
 # - Mozilla Public License version 1.1
 # - Public Domain
-# - Revised BSD License
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version
 #							2.0
@@ -56,5 +55,5 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Mar 13 21:16:37 CET 2024
+#Mon Sep 02 11:05:05 CEST 2024
 gnu.getopt--java-getopt--1.0.13=