diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index 9a9ba16bba19c339c8a271f13447422c2944d061..79ab2b823b21de625797217f814222b4f1d3f3d6 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -1,7 +1,7 @@
.maven_build:
extends: .default
stage: build
- image: maven:3.9.5-ibm-semeru-17-focal
+ image: maven:3.9.9-ibm-semeru-17-focal
script:
- mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
artifacts:
@@ -26,7 +26,7 @@
.angular_build:
extends: .default
stage: build
- image: trion/ng-cli:14.2.6
+ image: trion/ng-cli:13.3.7
script:
- |
if [ ! -f "./src/assets/config/theming.scss" ]; then
diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index a5c86697e727ef62c38b8c1801f0f23ec20c0b4e..bf2678b8b766c2301b1ba1e7905cd2f46f02f3f9 100644
--- a/ci-templates/build_unprotected.yml
+++ b/ci-templates/build_unprotected.yml
@@ -1,7 +1,7 @@
.maven_build:
extends: .default
stage: build
- image: maven:3.9.5-ibm-semeru-17-focal
+ image: maven:3.9.9-ibm-semeru-17-focal
script:
- mvn install -s ci_settings.xml
artifacts:
@@ -20,7 +20,7 @@
.angular_build:
extends: .default
stage: build
- image: trion/ng-cli:14.2.6
+ image: trion/ng-cli:13.3.7
script:
- |
if [ ! -f "./src/assets/config/theming.scss" ]; then
diff --git a/ci-templates/default.yml b/ci-templates/default.yml
index e49b634243ca7c5870671034b0027e80ea233d53..c231446304b8bc045c08c1f41b55c9ff97321c3f 100644
--- a/ci-templates/default.yml
+++ b/ci-templates/default.yml
@@ -7,11 +7,23 @@ stages:
.default:
before_script:
+ - set -e
- |
if [ "$CI_COMMIT_REF_PROTECTED" = true ] && [ -n "$CI_COMMIT_TAG" ]; then
export APP_VERSION=$CI_COMMIT_TAG
elif [ "$CI_COMMIT_REF_NAME" = "develop" ]; then
export APP_VERSION="develop"
else
- export APP_VERSION=$CI_COMMIT_REF_NAME
+ # Replace '/' with '-' and check for any invalid characters
+ APP_VERSION=$(echo "$CI_COMMIT_REF_NAME" | sed 's|/|-|g')
+
+ # Check for invalid characters (only allow lowercase letters, digits, '_', '.', '-')
+ if echo "$APP_VERSION" | grep -q '[^a-zA-Z0-9._-]'; then
+ echo "Error: Branch name contains invalid characters for Docker tags. Only a-z, 0-9, '_', '.', and '-' are allowed."
+ exit 1
+ fi
+
+ # Convert to lowercase
+ export APP_VERSION=$(echo "$APP_VERSION" | tr 'A-Z' 'a-z')
fi
+ - echo "APP_VERSION set to $APP_VERSION"
diff --git a/compose/deploy.sh b/compose/deploy.sh
index 94071cf2f48c5741be21fe658c795d238f8382db..d8ac5383db45435b482eb5355c904f8a5565059c 100644
--- a/compose/deploy.sh
+++ b/compose/deploy.sh
@@ -23,7 +23,7 @@ updaterepo(){
# Build maven project if .pom file is present
if [ -f "./pom.xml" ]; then
- docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.5-ibm-semeru-17-focal mvn clean verify -DskipTests
+ docker run -it --rm -v "/home/ubuntu/.m2":/root/.m2 -v "$(pwd)":/opt/maven -w /opt/maven maven:3.9.9-ibm-semeru-17-focal mvn clean verify -DskipTests
fi
}
diff --git a/kubernetes/helm/openslice/Chart.yaml b/kubernetes/helm/openslice/Chart.yaml
index 0e5de20ead69c9812efdc252aab641d8b48a9096..61f0a2169ba9a9b0e4476a3c1f0dcabb08bb57db 100644
--- a/kubernetes/helm/openslice/Chart.yaml
+++ b/kubernetes/helm/openslice/Chart.yaml
@@ -15,7 +15,7 @@ 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: 1.0.0
+version: 2.0.0-SNAPSHOT
# 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
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index ea1ffac809c390158827a126f2b0773981ca252e..bf78b5dd478c19f009fddd599d6537fb7b667c66 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -39,7 +39,8 @@ spec:
env:
- name: SPRING_APPLICATION_JSON
value: >-
- {
+ {
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/ostmfdb?createDatabaseIfNotExist=true&useUnicode=true&nullCatalogMeansCurrent=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -55,7 +56,8 @@ spec:
"spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false",
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
- "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}"
+ "logging.level.org.springframework" : "{{ .Values.oasapi.spring.logLevel | default "INFO" }}",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 8c2927c3116af756659c34645cdcad957b7b0500..6df11d4899aec82bc2f40444c8721ee57e94edce 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -41,6 +41,7 @@ spec:
- name: SPRING_APPLICATION_JSON
value: >-
{
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework" : "{{ .Values.portalapi.spring.logLevel | default "INFO" }}",
- "logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}"
+ "logging.level.org.etsi.osl.portal.api": "{{ .Values.portalapi.logLevel | default "INFO" }}",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index cf96f7d26268efc80d2d38e727ce98290028802b..758d5194bba9efd07fe9e9b5dcdcb91a17611667 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -40,6 +40,7 @@ spec:
- name: SPRING_APPLICATION_JSON
value: >-
{
+ "origins":"{{ .Values.rooturl }}",
"spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/osdb?createDatabaseIfNotExist=true",
"spring.datasource.username": "{{ .Values.oscreds.mysql.username }}",
"spring.datasource.password": "{{ .Values.oscreds.mysql.password }}",
@@ -57,7 +58,8 @@ spec:
"spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",
"spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
"logging.level.org.springframework": "{{ .Values.osscapi.spring.logLevel | default "INFO" }}",
- "kroki.serverurl":"{{ .Values.rooturl }}/kroki"
+ "kroki.serverurl":"{{ .Values.rooturl }}/kroki",
+ "server.forward-headers-strategy":"FRAMEWORK"
}
resources:
{{- toYaml .Values.resources | nindent 12 }}
diff --git a/pom.xml b/pom.xml
index b22ca3a80a9b3bb430d1024fae9c3513dc099d4d..2b834d7f4a6a9cae2763b0408d6ef29c34e91ff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
<groupId>org.etsi.osl</groupId>
<artifactId>org.etsi.osl.main</artifactId>
- <version>1.0.0</version>
+ <version>2024Q4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>org.etsi.osl.main</name>
<organization>
- <name>openslice.io</name>
- <url>http://openslice.io</url>
+ <name>OpenSlice by ETSI</name>
+ <url>https://osl.etsi.org</url>
</organization>
<inceptionYear>2019</inceptionYear>
@@ -33,24 +33,23 @@
<springdoc-openapiui-version>1.7.0</springdoc-openapiui-version>
<!-- osl components -->
- <org.etsi.osl.bugzilla.version>1.0.0</org.etsi.osl.bugzilla.version>
- <org.etsi.osl.centrallog.client.version>1.0.0</org.etsi.osl.centrallog.client.version>
- <org.etsi.osl.centrallog.service.version>1.0.0</org.etsi.osl.centrallog.service.version>
- <org.etsi.osl.cridge.version>1.0.0</org.etsi.osl.cridge.version>
- <org.etsi.osl.main.version>1.0.0</org.etsi.osl.main.version>
- <org.etsi.osl.mano.version>1.0.0</org.etsi.osl.mano.version>
- <org.etsi.osl.model.version>1.0.0</org.etsi.osl.model.version>
- <org.etsi.osl.model.k8s.version>1.0.0</org.etsi.osl.model.k8s.version>
- <org.etsi.osl.model.nfv.version>1.0.0</org.etsi.osl.model.nfv.version>
- <org.etsi.osl.model.tmf.version>1.0.0</org.etsi.osl.model.tmf.version>
- <org.etsi.osl.oas.version>1.0.0</org.etsi.osl.oas.version>
- <org.etsi.osl.osom.version>1.0.0</org.etsi.osl.osom.version>
- <org.etsi.osl.portal.api.version>1.0.0</org.etsi.osl.portal.api.version>
- <org.etsi.osl.portal.web.version>1.0.0</org.etsi.osl.portal.web.version>
- <org.etsi.osl.sol005nbi.osm.version>1.0.0</org.etsi.osl.sol005nbi.osm.version>
- <org.etsi.osl.sol005nbi.osm10.version>1.0.0</org.etsi.osl.sol005nbi.osm10.version>
- <org.etsi.osl.tmf.api.version>1.0.0</org.etsi.osl.tmf.api.version>
- <org.etsi.osl.tmf.web.version>1.0.0</org.etsi.osl.tmf.web.version>
+ <org.etsi.osl.bugzilla.version>1.0.1-SNAPSHOT</org.etsi.osl.bugzilla.version>
+ <org.etsi.osl.centrallog.client.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.client.version>
+ <org.etsi.osl.centrallog.service.version>1.0.1-SNAPSHOT</org.etsi.osl.centrallog.service.version>
+ <org.etsi.osl.cridge.version>1.1.0-SNAPSHOT</org.etsi.osl.cridge.version>
+ <org.etsi.osl.main.version>2024Q4-SNAPSHOT</org.etsi.osl.main.version>
+ <org.etsi.osl.mano.version>1.0.1-SNAPSHOT</org.etsi.osl.mano.version>
+ <org.etsi.osl.model.k8s.version>1.1.0-SNAPSHOT</org.etsi.osl.model.k8s.version>
+ <org.etsi.osl.model.nfv.version>1.0.1-SNAPSHOT</org.etsi.osl.model.nfv.version>
+ <org.etsi.osl.model.tmf.version>1.1.0-SNAPSHOT</org.etsi.osl.model.tmf.version>
+ <org.etsi.osl.oas.version>1.0.1-SNAPSHOT</org.etsi.osl.oas.version>
+ <org.etsi.osl.osom.version>1.0.1-SNAPSHOT</org.etsi.osl.osom.version>
+ <org.etsi.osl.portal.api.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.api.version>
+ <org.etsi.osl.portal.web.version>1.0.1-SNAPSHOT</org.etsi.osl.portal.web.version>
+ <org.etsi.osl.sol005nbi.osm.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm.version>
+ <org.etsi.osl.sol005nbi.osm10.version>1.0.1-SNAPSHOT</org.etsi.osl.sol005nbi.osm10.version>
+ <org.etsi.osl.tmf.api.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.api.version>
+ <org.etsi.osl.tmf.web.version>1.1.0-SNAPSHOT</org.etsi.osl.tmf.web.version>
<!-- mainly for gw api -->