Commit ad7c46a5 authored by George Tziavas's avatar George Tziavas
Browse files

Got POM simillar to the other osl projects

parent 3ae253dd

pom.xml

+59 −52
Original line number Diff line number Diff line
@@ -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>



			<!--			&lt;!&ndash; Camel BOM &ndash;&gt;-->

			<!--			<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>
@@ -90,32 +96,34 @@ 
		</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-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>

src/main/resources/application.yml

+15 −10
Original line number Diff line number Diff line
@@ -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