Commit 52b5d703 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'develop' into 'main' 

MR for Release 2024Q4
parents 52b888df 5a642bf0

.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
/target

*.iml

.classpath

.project
 
 No newline at end of file

.gitlab-ci.yml

0 → 100644
+40 −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

.settings/org.eclipse.core.resources.prefs

0 → 100644
+6 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

encoding//src/main/java=utf-8

encoding//src/main/resources=utf-8

encoding//src/test/java=utf-8

encoding//src/test/resources=utf-8

encoding/<project>=UTF-8

.settings/org.eclipse.jdt.apt.core.prefs

0 → 100644
+4 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.apt.aptEnabled=true

org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations

org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

.settings/org.eclipse.jdt.core.prefs

0 → 100644
+9 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.core.compiler.codegen.targetPlatform=17

org.eclipse.jdt.core.compiler.compliance=17

org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore

org.eclipse.jdt.core.compiler.processAnnotations=enabled

org.eclipse.jdt.core.compiler.release=disabled

org.eclipse.jdt.core.compiler.source=17