Commit 396806c9 authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: upgrade to tmf.parent 1.3.0, tmf.common 1.3.0, tmf.schema 2.10.0, quarkus 3.40.1.1

parent d81d6627

mvnw

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

pom.xml

+3 −12
Changes for pom.xml: 3 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
    <parent>

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

        <artifactId>tmf.parent</artifactId>

        <version>1.2.0</version>

        <version>1.3.0</version>

        <!-- Signify parent lookup from artifact repository -->

        <relativePath/>

    </parent>
@@ -166,13 +166,13 @@ 
        <dependency>

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

            <artifactId>tmf.common</artifactId>

            <version>1.2.0</version>

            <version>1.3.0</version>

        </dependency>



        <dependency>

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

            <artifactId>tmf.schema</artifactId>

            <version>2.9.0</version>

            <version>2.10.0</version>

            <exclusions>

                <exclusion>

                    <groupId>io.quarkus</groupId>
@@ -180,15 +180,6 @@ 
                </exclusion>

            </exclusions>

        </dependency>

<!--        <dependency>-->

<!--            <groupId>io.quarkus</groupId>-->

<!--            <artifactId>quarkus-oidc-client</artifactId>-->

<!--        </dependency>-->

<!--        <dependency>-->

<!--            <groupId>io.quarkus</groupId>-->

<!--            <artifactId>quarkus-scheduler</artifactId>-->

<!--        </dependency>-->

        <!-- Testing -->

        <dependency>

            <groupId>org.mapstruct</groupId>

            <artifactId>mapstruct</artifactId>

src/main/java/org/etsi/osl/hypo/api/peering/services/PeeringService.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/api/peering/services/PeeringService.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import jakarta.inject.Inject; 
import java.util.ArrayList;

import java.util.List;

import java.util.Map;

import org.apache.commons.lang.StringUtils;

import org.apache.commons.lang3.StringUtils;

import org.etsi.osl.hypo.api.peering.entity.OssClientData;

import org.etsi.osl.hypo.api.peering.kafka.outgoing.PeeringProducer;

import org.etsi.osl.hypo.api.peering.model.OssLifecycleData;

src/main/java/org/etsi/osl/hypo/api/peering/util/swagger/filters/DynamicOidcOasFilter.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/api/peering/util/swagger/filters/DynamicOidcOasFilter.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import org.eclipse.microprofile.openapi.models.security.OAuthFlows; 
import org.eclipse.microprofile.openapi.models.security.SecurityRequirement;

import org.eclipse.microprofile.openapi.models.security.SecurityScheme;



@OpenApiFilter(OpenApiFilter.RunStage.RUN)

@OpenApiFilter(stages = OpenApiFilter.RunStage.RUNTIME_PER_REQUEST)

public class DynamicOidcOasFilter implements OASFilter {



    @Override

src/main/resources/application.properties

+8 −1
Changes for src/main/resources/application.properties: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -18,9 +18,13 @@ mp.openapi.extensions.smallrye.info.contact.url=https://osl.etsi.org/hypo/docume 
mp.openapi.extensions.smallrye.info.license.name=HypO

quarkus.hibernate-orm.mapping.format.global=ignore

quarkus.keycloak.devservices.start-timeout=PT5M



### DEV SERVICES IMAGES

quarkus.datasource.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/postgres:14

quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/vectorized/redpanda:v22.3.4

quarkus.kafka.devservices.provider=redpanda

quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/redpandadata/redpanda:v23.3.14

quarkus.keycloak.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/keycloak/keycloak:22.0.3



################## PROMETHEUS METRICS ##################

quarkus.micrometer.export.json.enabled=true

quarkus.micrometer.export.prometheus.path=metrics/prometheus
@@ -160,3 +164,6 @@ quarkus.flyway.baseline-description=Initial state before Flyway 


# Force Flyway to execute both main schema AND test mock data

%test.quarkus.flyway.locations=db/migration,db/migration-test



%unittest.quarkus.flyway.clean-at-start=true

%test.quarkus.flyway.clean-at-start=true
 
 No newline at end of file