From 0ca7c8b9d82da8081f6dbd598fab8dd8e8710014 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Mon, 6 Nov 2023 13:33:14 +0200 Subject: [PATCH 01/14] Initial commit --- .gitignore | 4 + Dockerfile.centrallog | 6 + pom.xml | 209 ++++++++++++++++++ .../centrallog/service/CentralLogService.java | 56 +++++ .../service/CentralLoggerConfig.java | 45 ++++ .../service/CentralLoggerRouteBuilder.java | 73 ++++++ src/main/resources/application.yml | 39 ++++ src/main/resources/bootstrap.yml | 0 src/main/resources/logback.xml | 60 +++++ 9 files changed, 492 insertions(+) create mode 100644 .gitignore create mode 100644 Dockerfile.centrallog create mode 100644 pom.xml create mode 100644 src/main/java/org/etsi/osl/centrallog/service/CentralLogService.java create mode 100644 src/main/java/org/etsi/osl/centrallog/service/CentralLoggerConfig.java create mode 100644 src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/bootstrap.yml create mode 100644 src/main/resources/logback.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5601d3b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +.project +.classpath +/.settings diff --git a/Dockerfile.centrallog b/Dockerfile.centrallog new file mode 100644 index 0000000..3fe8ac2 --- /dev/null +++ b/Dockerfile.centrallog @@ -0,0 +1,6 @@ +FROM ibm-semeru-runtimes:open-17.0.7_7-jdk +MAINTAINER openslice.io +RUN mkdir /opt/shareclasses +RUN mkdir -p /opt/openslice/lib/ +COPY target/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..e7c5e5b --- /dev/null +++ b/pom.xml @@ -0,0 +1,209 @@ + + + 4.0.0 + + + org.etsi.osl + org.etsi.osl.main + 1.2.0-SNAPSHOT + ../org.etsi.osl.main + + + org.etsi.osl.centrallog.service + org.etsi.osl.centrallog.service + + + UTF-8 + UTF-8 + ${spring-boot-version} + ${spring-cloud-consul-version} + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot-version} + pom + import + + + + org.apache.camel.springboot + camel-spring-boot-dependencies + ${camel.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-cache + + + + org.apache.camel.springboot + camel-undertow-starter + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-starter-bootstrap + 3.0.2 + + + + + + + + org.springframework.boot + spring-boot-starter-activemq + + + org.apache.activemq + activemq-amqp + test + + + org.apache.qpid + proton-j + + + + + org.messaginghub + pooled-jms + + + + + + org.apache.camel.springboot + camel-spring-boot-starter + + + org.apache.activemq + activemq-pool + + + org.apache.camel + camel-activemq + + + org.apache.activemq + activemq-broker + + + + + org.apache.camel.springboot + camel-service-starter + + + + org.apache.camel.springboot + camel-http-starter + + + org.apache.camel + camel-jackson + + + org.apache.camel + camel-http-common + + + org.apache.camel + camel-stream + + + com.h2database + h2 + + + + + org.etsi.osl + org.etsi.osl.model + ${project.version} + + + org.etsi.osl + org.etsi.osl.tmf.api + ${project.version} + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-version} + + + + repackage + + + + + + + + + + + diff --git a/src/main/java/org/etsi/osl/centrallog/service/CentralLogService.java b/src/main/java/org/etsi/osl/centrallog/service/CentralLogService.java new file mode 100644 index 0000000..c4b34df --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/service/CentralLogService.java @@ -0,0 +1,56 @@ +package org.etsi.osl.centrallog.service; + +/*- + * ========================LICENSE_START================================= + * org.etsi.osl.bugzilla + * %% + * Copyright (C) 2019 openslice.io + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================LICENSE_END================================== + */ + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.context.config.annotation.RefreshScope; + + +/** + * @author ichatzis + * + * based on + * https://github.com/apache/camel/tree/master/examples/camel-example-spring-boot-activemq + * https://github.com/indrabasak/spring-consul-example + */ +// This is equivalent to @Configuration, @EnableAutoConfiguration, and @ComponentScan +@SpringBootApplication +// This annotation is used for consul +@EnableDiscoveryClient +//@EnableRetry +// This is from spring-cloud to allow local configuration application +@RefreshScope +// @EnableAutoConfiguration annotation tells Spring Boot to "guess" how you will want to configure Spring, +// based on the jar dependencies that you have added. For example, If HSQLDB is on your classpath, and you +// have not manually configured any database connection beans, then Spring will auto-configure an in-memory database. +@EnableAutoConfiguration +// This is enabled by default +@EnableConfigurationProperties +public class CentralLogService { + public static void main(String[] args) { + SpringApplication.run( CentralLogService.class, args); + } +} diff --git a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerConfig.java b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerConfig.java new file mode 100644 index 0000000..756d141 --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerConfig.java @@ -0,0 +1,45 @@ +package org.etsi.osl.centrallog.service; + +/*- + * ========================LICENSE_START================================= + * org.etsi.osl.portal.api + * %% + * Copyright (C) 2019 openslice.io + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================LICENSE_END================================== + */ +/** + * @author ichatzis + **/ + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties +@ConfigurationProperties +public class CentralLoggerConfig { + + + private String centrallogurl; + + public String getCentrallogurl() { + return centrallogurl; + } + + public void setCentrallogurl(String centrallogurl) { + this.centrallogurl = centrallogurl; + } +} diff --git a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java new file mode 100644 index 0000000..60b6bc9 --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java @@ -0,0 +1,73 @@ +package org.etsi.osl.centrallog.service; +/*- + * ========================LICENSE_START================================= + * org.etsi.osl.portal.api + * %% + * Copyright (C) 2019 openslice.io + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =========================LICENSE_END================================== + */ +/** + * @author ichatzis + **/ + +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +@Configuration +@Component +public class CentralLoggerRouteBuilder extends RouteBuilder{ + + + private static String CENTRALLOGGERURL = ""; + + @Autowired + private CentralLoggerConfig centrallogerconfig; + private static final transient Log logger = LogFactory.getLog( CentralLoggerRouteBuilder.class.getName()); + + public void configure() { + + + if ( centrallogerconfig.getCentrallogurl() != null) { + CENTRALLOGGERURL = centrallogerconfig.getCentrallogurl(); + } + + if ( ( CENTRALLOGGERURL == null ) || CENTRALLOGGERURL.equals( "" ) ){ + logger.info( "NO CENTRALLOGGERURL ROUTING. ELASTICURL = " + CENTRALLOGGERURL); + return; + } + logger.info( "ENABLED CENTRALLOGGERURL ROUTING. ELASTICURL = " + CENTRALLOGGERURL); + + String url = CENTRALLOGGERURL; + + from("activemq:queue:centrallogger.log") + .log( "activemq:queue:centrallogger.log package with body ${body} !" ) + .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST)) + .setHeader("Content-Type", constant("application/json")) + .to("log:DEBUG?showBody=true&showHeaders=true") + .doTry() + .toD( url ) + .to("log:DEBUG?showBody=true&showHeaders=true") + .doCatch(Exception.class) + .setBody(exceptionMessage().convertToString()) + .to("log:DEBUG?showBody=true&showHeaders=true") + .end(); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..67fb3f7 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,39 @@ + +# For Spring Actuator /info endpoint +info: + artifact: centrallog-service + name: centrallog-service + description: Spring centrallog-service + version: 1.0.0 + +server: + port: 13013 + + +logging: + level: + org.apache.camel: INFO + file: logs/application-debug.log + pattern: + console: "%d %-5level %logger : %msg%n" + file: "%d %-5level [%thread] %logger : %msg%n" + + +spring: + config: + activate: + on-profile: "default" + application: + name: centrallog-service + activemq: + brokerUrl: tcp://localhost:61616?jms.watchTopicAdvisories=false + user: artemis + password: artemis + pool: + enabled: true + max-connections: 100 + packages: + trust-all: true + +centrallogurl: "http://elk_ip:elk_port/index_name/_doc" + diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..208c635 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + app.log + + + logs/archived/app.%d{yyyy-MM-dd}.%i.log + + 10MB + + 20GB + + 60 + + + + %d %p %c{1.} [%t] %m%n + + + + + + + + + + + -- GitLab From 57bc36dbc80680837f78daa126bcd27c03cf7cb6 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Sat, 25 Nov 2023 19:48:14 +0200 Subject: [PATCH 02/14] remove unused reference --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index e7c5e5b..be0fc4f 100644 --- a/pom.xml +++ b/pom.xml @@ -155,11 +155,6 @@ - - org.etsi.osl - org.etsi.osl.model - ${project.version} - org.etsi.osl org.etsi.osl.tmf.api -- GitLab From 6c682675965cd8fde378f5b254cfa57ba2e0d073 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Tue, 28 Nov 2023 17:01:51 +0200 Subject: [PATCH 03/14] refactored fix for #2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be0fc4f..ebab11f 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.etsi.osl - org.etsi.osl.tmf.api + org.etsi.osl.model.tmf ${project.version} -- GitLab From 87af0ca6996d831d54d192b306a97ad1e7ec8ad4 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 14:59:58 +0000 Subject: [PATCH 04/14] added mvn artifact ci automation --- .gitlab-ci.yml | 8 ++++++++ ci_settings.xml | 16 ++++++++++++++++ pom.xml | 18 +++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci.yml create mode 100644 ci_settings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..db0ad64 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +stages: + - deploy + +deploy: + stage: deploy + image: maven:3.9.5-ibm-semeru-17-focal + script: + - mvn deploy -s ci_settings.xml -DskipTests diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000..69ad06e --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ + + + + gitlab-maven + + + + Job-Token + ${CI_JOB_TOKEN} + + + + + + diff --git a/pom.xml b/pom.xml index ebab11f..3bcb1d6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,23 @@ ${spring-cloud-consul-version} - + + + gitlab-maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + + + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + -- GitLab From ed9d38bbeb49b65c1311f33d0f0df2cca02f031a Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 15:21:12 +0000 Subject: [PATCH 05/14] used generic CICD var for URL --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bcb1d6..7a37fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ gitlab-maven - https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + ${CI_API_V4_URL}/groups/260/-/packages/maven -- GitLab From 927509f74b80793ea1ab977676629db44b3d3d96 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 8 Dec 2023 15:24:58 +0000 Subject: [PATCH 06/14] used full URL for group registry --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a37fa6..3bcb1d6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ gitlab-maven - ${CI_API_V4_URL}/groups/260/-/packages/maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven -- GitLab From c31bb07ee2d454687eb47c530dc518f013d22215 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 12:31:25 +0000 Subject: [PATCH 07/14] refactored ci to use inheritance --- .gitlab-ci.yml | 32 ++++++++++++++++++++++------- Dockerfile.centrallog => Dockerfile | 0 2 files changed, 25 insertions(+), 7 deletions(-) rename Dockerfile.centrallog => Dockerfile (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db0ad64..18e0625 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,26 @@ -stages: - - deploy +include: + - project: osl/code/org.etsi.osl.main + ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main + file: + - ci-templates/default.yml + - ci-templates/build.yml + only: + - main + - develop -deploy: - stage: deploy - image: maven:3.9.5-ibm-semeru-17-focal - script: - - mvn deploy -s ci_settings.xml -DskipTests + - project: osl/code/org.etsi.osl.main + ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main + file: + - ci-templates/default.yml + - ci-templates/build_unprotected.yml + except: + - main + - develop + +maven_build: + extends: .maven_build + +docker_build: + extends: .docker_build + needs: + - maven_build diff --git a/Dockerfile.centrallog b/Dockerfile similarity index 100% rename from Dockerfile.centrallog rename to Dockerfile -- GitLab From 473bb1fa352b2b3075a2233cf58ab76dd582d336 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Tue, 19 Dec 2023 13:50:53 +0000 Subject: [PATCH 08/14] used dynamic ref in inheritance --- .gitlab-ci.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18e0625..8ea78d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,27 @@ include: - project: osl/code/org.etsi.osl.main - ref: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main + ref: main file: - ci-templates/default.yml - ci-templates/build.yml - only: - - main - - develop + 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: 12-update-gitlab-ci-file-to-use-inherited-jobs-from-main + ref: develop file: - ci-templates/default.yml - ci-templates/build_unprotected.yml - except: - - main - - develop + rules: + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' maven_build: extends: .maven_build -- GitLab From f1c88a7df2dff0dcdbb256fa653081b85ed89f80 Mon Sep 17 00:00:00 2001 From: trantzas Date: Mon, 22 Jan 2024 11:51:52 +0000 Subject: [PATCH 09/14] Upload license file --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- GitLab From 40acacd78d7617b2a53349671d7ecaef16d0c9a5 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Mon, 22 Jan 2024 12:11:20 +0000 Subject: [PATCH 10/14] version per osl component from parent --- Dockerfile | 4 ++-- pom.xml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fe8ac2..8bb0db3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk MAINTAINER openslice.io RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ -COPY target/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.2.0-SNAPSHOT.jar"] \ No newline at end of file +COPY target/org.etsi.osl.centrallog.service-1.0.0-SNAPSHOT.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.0.0-SNAPSHOT.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3bcb1d6..60ca93d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.etsi.osl org.etsi.osl.main - 1.2.0-SNAPSHOT + 1.0.0-SNAPSHOT ../org.etsi.osl.main @@ -174,7 +173,7 @@ org.etsi.osl org.etsi.osl.model.tmf - ${project.version} + ${org.etsi.osl.model.tmf.version} -- GitLab From 5dabb4271e921d9894b7050dc8001107c4aebad5 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Wed, 31 Jan 2024 22:36:49 +0200 Subject: [PATCH 11/14] try topic --- .../osl/centrallog/service/CentralLoggerRouteBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java index 60b6bc9..a08395e 100644 --- a/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java +++ b/src/main/java/org/etsi/osl/centrallog/service/CentralLoggerRouteBuilder.java @@ -56,8 +56,8 @@ public class CentralLoggerRouteBuilder extends RouteBuilder{ String url = CENTRALLOGGERURL; - from("activemq:queue:centrallogger.log") - .log( "activemq:queue:centrallogger.log package with body ${body} !" ) + from("jms:topic:centrallogger.log") + .log( "jms:topic:centrallogger.log package with body ${body} !" ) .setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http.HttpMethods.POST)) .setHeader("Content-Type", constant("application/json")) .to("log:DEBUG?showBody=true&showHeaders=true") -- GitLab From 16c379c4c94fc2509413c7c6ab64315b8982ac86 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Thu, 13 Jun 2024 12:47:12 +0000 Subject: [PATCH 12/14] feat: version 1.0.0 --- Dockerfile | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bb0db3..a80e534 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,5 @@ FROM ibm-semeru-runtimes:open-17.0.7_7-jdk MAINTAINER openslice.io RUN mkdir /opt/shareclasses RUN mkdir -p /opt/openslice/lib/ -COPY target/org.etsi.osl.centrallog.service-1.0.0-SNAPSHOT.jar /opt/openslice/lib/ -CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.0.0-SNAPSHOT.jar"] \ No newline at end of file +COPY target/org.etsi.osl.centrallog.service-1.0.0.jar /opt/openslice/lib/ +CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.centrallog.service-1.0.0.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index 60ca93d..d957357 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.etsi.osl org.etsi.osl.main - 1.0.0-SNAPSHOT + 1.0.0 ../org.etsi.osl.main -- GitLab From 73c732509b5cee27ca7893e50065953d4e192680 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 14 Jun 2024 11:39:28 +0000 Subject: [PATCH 13/14] fix: add protected run --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ea78d6..6b853e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "develop"' + - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED' - project: osl/code/org.etsi.osl.main ref: develop @@ -21,7 +21,7 @@ include: - ci-templates/default.yml - ci-templates/build_unprotected.yml rules: - - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' maven_build: extends: .maven_build -- GitLab From af1cca7cca887ad442c2e031492b05f48129efd0 Mon Sep 17 00:00:00 2001 From: Dimitrios Giannopoulos Date: Fri, 14 Jun 2024 13:03:01 +0000 Subject: [PATCH 14/14] fix: side branch references main's side branch --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b853e7..bb7d754 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,15 @@ include: - ci-templates/default.yml - ci-templates/build.yml rules: - - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_PROTECTED' + - 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 && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' - project: osl/code/org.etsi.osl.main ref: develop -- GitLab