diff --git a/pom.xml b/pom.xml
index b0054ccd6a6997416275ef40cee2b7556b6f33db..faa074bab0207287f57150235ea1cdd29adec52c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,26 +5,27 @@
<parent>
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2024Q4-SNAPSHOT</version>
<relativePath>../org.etsi.osl.main</relativePath>
</parent>
<artifactId>org.etsi.osl.metrico</artifactId>
<name>org.etsi.osl.metrico</name>
+<!-- <version>${org.etsi.osl.cridge.version}</version>-->
<url>http://openslice.io</url>
+ <organization>
+ <name>OpenSlice by ETSI</name>
+ <url>https://osl.etsi.org</url>
+ </organization>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring.boot-version>3.2.2</spring.boot-version>
-
<spring.boot-version>${spring-boot-version}</spring.boot-version>
- <!-- These versions work>spring.boot.fabric8-version>3.0.5</spring.boot.fabric8-version -->
- <!-- x>fabric8.version>6.6.2</fabric8.version -->
-
<camel.version>4.0.0-RC1</camel.version>
<slf4j-api.version>1.7.5</slf4j-api.version>
<slf4j-simple.version>1.7.28</slf4j-simple.version>
@@ -37,16 +38,16 @@
<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>
</repository>
</repositories>
- <!-- <distributionManagement>
- <repository>
- <id>gitlab-maven</id>
- <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
- </repository>
- <snapshotRepository>
- <id>gitlab-maven</id>
- <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
- </snapshotRepository>
- </distributionManagement> -->
+<!-- <distributionManagement>-->
+<!-- <repository>-->
+<!-- <id>gitlab-maven</id>-->
+<!-- <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>-->
+<!-- </repository>-->
+<!-- <snapshotRepository>-->
+<!-- <id>gitlab-maven</id>-->
+<!-- <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>-->
+<!-- </snapshotRepository>-->
+<!-- </distributionManagement>-->
<dependencyManagement>
<dependencies>
@@ -59,21 +60,26 @@
<scope>import</scope>
</dependency>
- <!-- <!– Camel BOM –>-->
- <!-- <dependency>-->
- <!-- <groupId>org.apache.camel.springboot</groupId>-->
- <!-- <artifactId>camel-spring-boot-dependencies</artifactId>-->
- <!-- <version>${camel.version}</version>-->
- <!-- <type>pom</type>-->
- <!-- <scope>import</scope>-->
- <!-- </dependency>-->
-
+ <!-- Camel BOM -->
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-dependencies</artifactId>
+ <version>${camel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
-
</dependencyManagement>
<dependencies>
+ <!-- org.etsi.osl -->
+ <dependency>
+ <groupId>org.etsi.osl</groupId>
+ <artifactId>org.etsi.osl.model.tmf</artifactId>
+ <version>${org.etsi.osl.model.tmf.version}</version>
+ </dependency>
+<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -89,33 +95,35 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
- <!-- activeMQ -->
- <!-- <dependency>-->
- <!-- <groupId>org.springframework.boot</groupId>-->
- <!-- <artifactId>spring-boot-starter-activemq</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>org.apache.activemq</groupId>-->
- <!-- <artifactId>activemq-amqp</artifactId>-->
- <!-- <scope>test</scope>-->
- <!-- <exclusions>-->
- <!-- <exclusion>-->
- <!-- <groupId>org.apache.qpid</groupId>-->
- <!-- <artifactId>proton-j</artifactId>-->
- <!-- </exclusion>-->
- <!-- </exclusions>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>org.messaginghub</groupId>-->
- <!-- <artifactId>pooled-jms</artifactId>-->
- <!-- </dependency>-->
+<!-- activeMQ -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-activemq</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-amqp</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.messaginghub</groupId>
+ <artifactId>pooled-jms</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
- <!-- Camel
+ <!-- Camel -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
@@ -150,7 +158,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-stream</artifactId>
- </dependency> -->
+ </dependency>
<!-- slf4j -->
@@ -163,11 +171,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.etsi.osl</groupId>
- <artifactId>org.etsi.osl.model.tmf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>mysql</groupId>
@@ -207,6 +210,10 @@
<version>6.1.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-jpa</artifactId>
+ </dependency>
</dependencies>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 993ec71bcf76c3e2b20f368446b8d52b4d1f12c0..9210047bcd9ac9a8d71da8967c0b722cc54e170a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,16 +28,21 @@ spring:
characterEncoding: utf-8
CharSet: utf-8
useUnicode: true
-# activemq:
-# brokerUrl: tcp://localhost:61616?jms.watchTopicAdvisories=false
-# user: artemis
-# password: artemis
-# pool:
-# enabled: true
-# max-connections: 100
-# packages:
-# trust-all: true
-
+ activemq:
+ brokerUrl: tcp://localhost:61616?jms.watchTopicAdvisories=false
+ user: artemis
+ password: artemis
+ pool:
+ enabled: true
+ max-connections: 100
+ packages:
+ trust-all: true
+ security:
+ oauth2:
+ resourceserver:
+ jwt:
+ issuer-uri: http://keycloak:8080/auth/realms/openslice
+ jwk-set-uri: http://keycloak:8080/auth/realms/openslice/.well-known/openid-configuration
server:
port: 8030