From dfd79814c2cb2e2849cc6a5d0624f54f87e0d853 Mon Sep 17 00:00:00 2001
From: Dennis Schiese <schiesedennis@googlemail.com>
Date: Wed, 26 Jun 2024 13:47:44 +0200
Subject: [PATCH] Poms, properties

---
 qanary_component-template/pom.xml             |  2 +-
 qanary_pipeline-template/pom.xml              | 23 +++----------------
 .../src/main/resources/application.properties | 16 ++++++-------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/qanary_component-template/pom.xml b/qanary_component-template/pom.xml
index 6ed4867c..1a38968b 100644
--- a/qanary_component-template/pom.xml
+++ b/qanary_component-template/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>eu.wdaqua.qanary</groupId>
             <artifactId>qa.commons</artifactId>
-            <version>3.16.0</version>
+            <version>[3.16.0,4.0.0)</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml
index 191c8be5..1bd4b599 100644
--- a/qanary_pipeline-template/pom.xml
+++ b/qanary_pipeline-template/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <java.version>11</java.version>
         <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
-        <qanary.version>[3.15.0,4.0.0)</qanary.version>
+        <qanary.version>[3.16.0,4.0.0)</qanary.version>
         <dockerfile-maven-version>1.4.13</dockerfile-maven-version>
         <docker.image.prefix>qanary</docker.image.prefix>
         <docker.image.name>qanary-pipeline</docker.image.name>
@@ -22,6 +22,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <springdoc.version>1.7.0</springdoc.version>
+        <jena.version>4.10.0</jena.version>
     </properties>
     <dependencies>
         <dependency>
@@ -157,22 +158,10 @@
             <version>4.6.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-arq -->
-        <dependency>
-            <groupId>org.apache.jena</groupId>
-            <artifactId>jena-arq</artifactId>
-            <version>4.10.0</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.jena/jena-core -->
-        <dependency>
-            <groupId>org.apache.jena</groupId>
-            <artifactId>jena-core</artifactId>
-            <version>4.10.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>
             <artifactId>jena-querybuilder</artifactId>
-            <version>4.10.0</version>
+            <version>${jena.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
@@ -272,12 +261,6 @@
             <artifactId>qa.component</artifactId>
             <version>3.10.0</version>
         </dependency>
-        <dependency>
-            <groupId>eu.wdaqua.qanary</groupId>
-            <artifactId>qa.commons</artifactId>
-            <version>3.15.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <!-- START - Setup for deployment to maven repository -->
diff --git a/qanary_pipeline-template/src/main/resources/application.properties b/qanary_pipeline-template/src/main/resources/application.properties
index 26ae53aa..2199ddd7 100644
--- a/qanary_pipeline-template/src/main/resources/application.properties
+++ b/qanary_pipeline-template/src/main/resources/application.properties
@@ -12,7 +12,7 @@
 ### name of your component
 spring.application.name=MyQanaryPipeline
 ### server configuration
-server.port=8081
+server.port=8080
 server.host=http://localhost
 ### SSL configuration
 # the path to the key store that contains the SSL certificate, e.g., classpath:keystore.p12
@@ -73,7 +73,7 @@ qanary.ontology=https://rawcdn.githack.com/WDAqua/QAOntology/6d25ebc8970b93452b5
 ### if the Qanary pipeline is not used in an interactive mode, components to be used can be predefined
 ### here (by names) 
 # example: qanary.components=FirstComponent,SecondComponent
-qanary.components=MyQanaryPipeline
+qanary.components=
 ### define what additional (local) properties files should be used
 spring.config.location=application.local.properties
 ### define access security for endpoints /configuration and /applications
@@ -98,9 +98,9 @@ springdoc.api-docs.path=/api-docs
 #stardog.password=admin
 ### Virtuoso: if you choose to use the Virtuoso triplestore, then the following properties are required to create an instance of QanaryTripleStoreConnector
 ### see the class for additional configuration properties interpreted by Virtuoso
-virtuoso.url=jdbc:virtuoso://localhost:1112
-virtuoso.username=dba
-virtuoso.password=dba
+#virtuoso.url=jdbc:virtuoso://localhost:1111
+#virtuoso.username=dba
+#virtuoso.password=dba
 ### changing CORS behavior
 ### see https://github.com/WDAqua/Qanary/blob/master/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/CorsConfigurationOnCondition.java for 
 # implementation details
@@ -111,6 +111,6 @@ virtuoso.password=dba
 #cors.global.addAllowedOriginPattern=
 #cors.global.endpointPattern=
 ### SETTINGS FOR QANARY PIPELINE AS COMPONENT
-pipeline.as.component=true
-spring.boot.admin.url=http://localhost:8080
-spring.boot.admin.client.url=http://localhost:8080
\ No newline at end of file
+pipeline.as.component=false
+#spring.boot.admin.url=http://localhost:8080
+#spring.boot.admin.client.url=http://localhost:8080
\ No newline at end of file