Commit f33331bf authored by Christos Tranoris's avatar Christos Tranoris
Browse files

merging

parents 897adc6a 104b31d5

.gitlab-ci.yml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
include:

  - project: osl/code/org.etsi.osl.main

    ref: main

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "main"'

  

  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME == "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: $CI_COMMIT_REF_NAME

    file: 

      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop

    file: 

      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'



maven_build:

  extends: .maven_build



docker_build:

  extends: .docker_build

  needs:

    - maven_build

README.md

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ mvn clean package 
mvn spring-boot:run



# Run packaged JAR

java -jar target/org.etsi.osl.controllers.ietf.ns-0.0.1-SNAPSHOT.jar

java -jar target/org.etsi.osl.controllers.ietf.ns-0.0.9-SNAPSHOT.jar



# Build without tests

mvn clean package -DskipTests

ci_settings.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">

  <servers>

    <server>

      <id>gitlab-maven</id>

      <configuration>

        <httpHeaders>

          <property>

            <name>Job-Token</name>

            <value>${CI_JOB_TOKEN}</value>

          </property>

        </httpHeaders>

      </configuration>

    </server>

  </servers>

</settings>

compose.yml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
services:

  osl-ietf-ns-controller:

    build:

      context: .

      dockerfile: Dockerfile

    image: labs.etsi.org:5050/osl/code/addons/org.etsi.osl.controllers.ietf.ns:develop

    container_name: osl-ietf-ns-controller

    restart: always

    profiles: ["dev", "prod"]

    environment:

      SPRING_ACTIVEMQ_BROKERURL: tcp://anartemis:61616?jms.watchTopicAdvisories=false

      SPRING_ACTIVEMQ_USER: artemis

      SPRING_ACTIVEMQ_PASSWORD: artemis

      RESTCONF_PROVIDERURL: "http://nscontroller:8085"

      RESTCONF_AUTHMETHOD: "basic"

      RESTCONF_AUTH_USERNAME: "admin"

      RESTCONF_AUTH_PASSWORD: "admin"

      RESTCONF_APIVERSION: "2025-05-09"

      LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: INFO

    logging:

      driver: "json-file"

      options:

        max-size: "250m"

        max-file: "2"       

    networks:

    -  compose_back



networks:

  compose_back:

    external: true

    
 No newline at end of file

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	<modelVersion>4.0.0</modelVersion>

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

	<artifactId>org.etsi.osl.controllers.ietf.ns</artifactId>

	<version>0.0.1-SNAPSHOT</version>

	<version>0.0.9-SNAPSHOT</version>

	<name>org.etsi.osl.controllers.ietf.ns</name>

	<description>org.etsi.osl.controllers.ietf.ns</description>
@@ -24,7 +24,7 @@ 
		<springdoc.security.version>1.7.0</springdoc.security.version>

		<springdoc.openapiui.version>1.7.0</springdoc.openapiui.version>

		<keycloak.version>22.0.1</keycloak.version>

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

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

	</properties>



	<repositories>