Skip to content
Snippets Groups Projects
Commit f1cb93a7 authored by Dimitrios Giannopoulos's avatar Dimitrios Giannopoulos
Browse files

Merge branch 'revert-e0c15a17' into...

Merge branch 'revert-e0c15a17' into '4-create-a-pipeline-to-build-and-publish-the-mvn-package-in-gitlab-registry'

Revert "Merge branch 'revert-5b74bbbc' into 'develop'"

See merge request !13
parents e0c15a17 4955e414
No related branches found
No related tags found
4 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!14Revert "Merge branch 'revert-5b74bbbc' into 'develop'",!13Revert "Merge branch 'revert-5b74bbbc' into 'develop'"
Pipeline #3585 passed
stages:
- deploy
deploy:
stage: deploy
image: maven:3.9.5-ibm-semeru-17-focal
script:
- mvn deploy -s ci_settings.xml -DskipTests
<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>
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<license.licenseName>apache_v2</license.licenseName> <license.licenseName>apache_v2</license.licenseName>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<camel.version>4.0.0-RC2</camel.version> <camel.version>4.0.0-RC2</camel.version>
<spring-boot-version>3.1.2</spring-boot-version> <spring-boot-version>3.1.2</spring-boot-version>
<swagger.version>3.0.0</swagger.version> <swagger.version>3.0.0</swagger.version>
...@@ -52,23 +51,24 @@ ...@@ -52,23 +51,24 @@
</properties> </properties>
<modules>
<module>../org.etsi.osl.bugzilla</module> <repositories>
<module>../org.etsi.osl.centrallog.client</module> <repository>
<module>../org.etsi.osl.centrallog.service</module> <id>gitlab-maven</id>
<module>../org.etsi.osl.cridge</module> <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
<module>../org.etsi.osl.mano</module> </repository>
<module>../org.etsi.osl.model.k8s</module> </repositories>
<module>../org.etsi.osl.model.nfv</module> <distributionManagement>
<module>../org.etsi.osl.model.tmf</module> <repository>
<module>../org.etsi.osl.oas</module> <id>gitlab-maven</id>
<module>../org.etsi.osl.osom</module> <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
<module>../org.etsi.osl.portal.api</module> </repository>
<module>../org.etsi.osl.sol005nbi.osm10</module> <snapshotRepository>
<module>../org.etsi.osl.sol005nbi.osm</module> <id>gitlab-maven</id>
<module>../org.etsi.osl.tmf.api</module> <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
</snapshotRepository>
</modules> </distributionManagement>
<build> <build>
<pluginManagement> <pluginManagement>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment