Commit f3367dc3 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2025Q2_RC' into 'develop' 

Merging "2025Q2_RC" to "develop" branch

See merge request !58
parents d7f263bd 4109cc54

compose/docker-compose.yaml.configure

+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ services: 
        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

        "spring.activemq.user": "artemis",

        "spring.activemq.password": "artemis",

        "logging.level.org.springframework" : "DEBUG",

        "logging.level.org.etsi.osl.metrico" : "DEBUG"

        "logging.level.org.springframework" : "INFO",

        "logging.level.org.etsi.osl.metrico" : "INFO"

        }'

    logging:

      driver: "json-file"

kubernetes/helm/openslice/Chart.yaml

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ type: application 
# This is the chart version. This version number should be incremented each time you make changes

# to the chart and its templates, including the app version.

# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 2.0.0

version: 2.1.0



# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

appVersion: 2025Q2-SNAPSHOT
 
appVersion: 2025Q2

kubernetes/helm/openslice/values.yaml

+2 −2
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ mysql: 


metrico:

  enabled: true

  logLevel: DEBUG

  logLevel: INFO

  spring:

    loglevel: DEBUG

    loglevel: INFO

  

cridge:

  enabled: true

pom.xml

+20 −20
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


	<groupId>org.etsi.osl</groupId>

	<artifactId>org.etsi.osl.main</artifactId>

	<version>2025Q2-SNAPSHOT</version>

	<version>2025Q2</version>

	<packaging>pom</packaging>



	<name>org.etsi.osl.main</name>
@@ -33,25 +33,25 @@ 
		<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>



		<!-- osl components -->

		<org.etsi.osl.bugzilla.version>1.0.2-SNAPSHOT</org.etsi.osl.bugzilla.version>

		<org.etsi.osl.centrallog.client.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.client.version>

		<org.etsi.osl.centrallog.service.version>1.0.2-SNAPSHOT</org.etsi.osl.centrallog.service.version>

		<org.etsi.osl.cridge.version>1.2.0-SNAPSHOT</org.etsi.osl.cridge.version>

		<org.etsi.osl.main.version>2025Q2-SNAPSHOT</org.etsi.osl.main.version>

		<org.etsi.osl.mano.version>1.0.2-SNAPSHOT</org.etsi.osl.mano.version>

		<org.etsi.osl.model.k8s.version>1.1.1-SNAPSHOT</org.etsi.osl.model.k8s.version>

		<org.etsi.osl.model.nfv.version>1.0.2-SNAPSHOT</org.etsi.osl.model.nfv.version>

		<org.etsi.osl.model.tmf.version>1.2.0-SNAPSHOT</org.etsi.osl.model.tmf.version>

		<org.etsi.osl.oas.version>1.0.2-SNAPSHOT</org.etsi.osl.oas.version>

		<org.etsi.osl.osom.version>1.2.0-SNAPSHOT</org.etsi.osl.osom.version>

		<org.etsi.osl.portal.api.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.api.version>

		<org.etsi.osl.portal.web.version>1.0.2-SNAPSHOT</org.etsi.osl.portal.web.version>

		<org.etsi.osl.sol005nbi.osm.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>

		<org.etsi.osl.sol005nbi.osm10.version>1.0.2-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>

		<org.etsi.osl.tmf.api.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.api.version>

		<org.etsi.osl.tmf.web.version>1.2.0-SNAPSHOT</org.etsi.osl.tmf.web.version>

		<org.etsi.osl.metrico.version>1.0.0-SNAPSHOT</org.etsi.osl.metrico.version>

		<org.etsi.osl.mcp.server.version>1.0.0-SNAPSHOT</org.etsi.osl.mcp.server.version>

		<org.etsi.osl.bugzilla.version>1.0.2</org.etsi.osl.bugzilla.version>

		<org.etsi.osl.centrallog.client.version>1.0.2</org.etsi.osl.centrallog.client.version>

		<org.etsi.osl.centrallog.service.version>1.0.2</org.etsi.osl.centrallog.service.version>

		<org.etsi.osl.cridge.version>1.2.0</org.etsi.osl.cridge.version>

		<org.etsi.osl.main.version>2025Q2</org.etsi.osl.main.version>

		<org.etsi.osl.mano.version>1.0.2</org.etsi.osl.mano.version>

		<org.etsi.osl.model.k8s.version>1.1.1</org.etsi.osl.model.k8s.version>

		<org.etsi.osl.model.nfv.version>1.1.0</org.etsi.osl.model.nfv.version>

		<org.etsi.osl.model.tmf.version>1.2.0</org.etsi.osl.model.tmf.version>

		<org.etsi.osl.oas.version>1.0.2</org.etsi.osl.oas.version>

		<org.etsi.osl.osom.version>1.2.0</org.etsi.osl.osom.version>

		<org.etsi.osl.portal.api.version>1.1.0</org.etsi.osl.portal.api.version>

		<org.etsi.osl.portal.web.version>1.0.2</org.etsi.osl.portal.web.version>

		<org.etsi.osl.sol005nbi.osm.version>1.0.2</org.etsi.osl.sol005nbi.osm.version>

		<org.etsi.osl.sol005nbi.osm10.version>1.0.2</org.etsi.osl.sol005nbi.osm10.version>

		<org.etsi.osl.tmf.api.version>1.2.0</org.etsi.osl.tmf.api.version>

		<org.etsi.osl.tmf.web.version>1.2.0</org.etsi.osl.tmf.web.version>

		<org.etsi.osl.metrico.version>1.0.0</org.etsi.osl.metrico.version>

		<org.etsi.osl.mcp.server.version>1.0.0</org.etsi.osl.mcp.server.version>





		<!-- mainly for gw api -->