aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/gerrit-verify.yaml101
-rw-r--r--app/build.gradle44
-rw-r--r--app/src/main/java/org/onap/portalng/history/HistoryApplication.java (renamed from app/src/main/java/org/onap/portal/history/HistoryApplication.java)6
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/BeansConfig.java (renamed from app/src/main/java/org/onap/portal/history/configuration/BeansConfig.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/Errorhandler.java (renamed from app/src/main/java/org/onap/portal/history/configuration/Errorhandler.java)5
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/HistoryConfig.java (renamed from app/src/main/java/org/onap/portal/history/configuration/HistoryConfig.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/RequestIdInterceptor.java (renamed from app/src/main/java/org/onap/portal/history/configuration/RequestIdInterceptor.java)4
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/SchedulerConfig.java (renamed from app/src/main/java/org/onap/portal/history/configuration/SchedulerConfig.java)5
-rw-r--r--app/src/main/java/org/onap/portalng/history/configuration/SecurityConfig.java (renamed from app/src/main/java/org/onap/portal/history/configuration/SecurityConfig.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/controller/ActionsController.java (renamed from app/src/main/java/org/onap/portal/history/controller/ActionsController.java)16
-rw-r--r--app/src/main/java/org/onap/portalng/history/entities/ActionsDao.java (renamed from app/src/main/java/org/onap/portal/history/entities/ActionsDao.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/exception/ProblemException.java (renamed from app/src/main/java/org/onap/portal/history/exception/ProblemException.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/LogContextVariable.java (renamed from app/src/main/java/org/onap/portal/history/logging/LogContextVariable.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/LoggerProperties.java (renamed from app/src/main/java/org/onap/portal/history/logging/LoggerProperties.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/LoggingHelper.java (renamed from app/src/main/java/org/onap/portal/history/logging/LoggingHelper.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/ReactiveRequestLoggingFilter.java (renamed from app/src/main/java/org/onap/portal/history/logging/ReactiveRequestLoggingFilter.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/StatusCode.java (renamed from app/src/main/java/org/onap/portal/history/logging/StatusCode.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/logging/WebExchangeUtils.java (renamed from app/src/main/java/org/onap/portal/history/logging/WebExchangeUtils.java)2
-rw-r--r--app/src/main/java/org/onap/portalng/history/repository/ActionsRepository.java (renamed from app/src/main/java/org/onap/portal/history/repository/ActionsRepository.java)4
-rw-r--r--app/src/main/java/org/onap/portalng/history/services/ActionsService.java (renamed from app/src/main/java/org/onap/portal/history/services/ActionsService.java)16
-rw-r--r--app/src/main/java/org/onap/portalng/history/util/IdTokenExchange.java (renamed from app/src/main/java/org/onap/portal/history/util/IdTokenExchange.java)4
-rw-r--r--app/src/main/java/org/onap/portalng/history/util/Logger.java (renamed from app/src/main/java/org/onap/portal/history/util/Logger.java)2
-rw-r--r--app/src/test/java/org/onap/portalng/history/BaseIntegrationTest.java (renamed from app/src/test/java/org/onap/portal/history/BaseIntegrationTest.java)5
-rw-r--r--app/src/test/java/org/onap/portalng/history/TokenGenerator.java (renamed from app/src/test/java/org/onap/portal/history/TokenGenerator.java)2
-rw-r--r--app/src/test/java/org/onap/portalng/history/actions/ActionDto.java (renamed from app/src/test/java/org/onap/portal/history/actions/ActionDto.java)2
-rw-r--r--app/src/test/java/org/onap/portalng/history/actions/ActionFixtures.java (renamed from app/src/test/java/org/onap/portal/history/actions/ActionFixtures.java)6
-rw-r--r--app/src/test/java/org/onap/portalng/history/actions/ActionsControllerIntegrationTest.java (renamed from app/src/test/java/org/onap/portal/history/actions/ActionsControllerIntegrationTest.java)18
-rw-r--r--buildSrc/src/main/groovy/org.onap.portalng.history.java-application-conventions.gradle (renamed from buildSrc/src/main/groovy/org.onap.portal.history.java-application-conventions.gradle)2
-rw-r--r--buildSrc/src/main/groovy/org.onap.portalng.history.java-common-conventions.gradle (renamed from buildSrc/src/main/groovy/org.onap.portal.history.java-common-conventions.gradle)0
-rw-r--r--buildSrc/src/main/groovy/org.onap.portalng.history.java-library-conventions.gradle (renamed from buildSrc/src/main/groovy/org.onap.portal.history.java-library-conventions.gradle)2
-rw-r--r--openapi/build.gradle12
-rw-r--r--releases/0.1.0-container-release.yaml7
-rw-r--r--version1
-rw-r--r--version.properties10
34 files changed, 216 insertions, 80 deletions
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
new file mode 100644
index 0000000..6819434
--- /dev/null
+++ b/.github/workflows/gerrit-verify.yaml
@@ -0,0 +1,101 @@
+---
+name: Gerrit Composed Gradle Verify CLM
+# yamllint disable-line rule:truthy
+on:
+ workflow_dispatch:
+ inputs:
+ GERRIT_BRANCH:
+ description: "Branch that change is against"
+ required: true
+ type: string
+ GERRIT_CHANGE_ID:
+ description: "The ID for the change"
+ required: true
+ type: string
+ GERRIT_CHANGE_NUMBER:
+ description: "The Gerrit number"
+ required: true
+ type: string
+ GERRIT_CHANGE_URL:
+ description: "URL to the change"
+ required: true
+ type: string
+ GERRIT_EVENT_TYPE:
+ description: "Type of Gerrit event"
+ required: true
+ type: string
+ GERRIT_PATCHSET_NUMBER:
+ description: "The patch number for the change"
+ required: true
+ type: string
+ GERRIT_PATCHSET_REVISION:
+ description: "The revision sha"
+ required: true
+ type: string
+ GERRIT_PROJECT:
+ description: "Project in Gerrit"
+ required: true
+ type: string
+ GERRIT_REFSPEC:
+ description: "Gerrit refspec of change"
+ required: true
+ type: string
+concurrency:
+ # yamllint disable-line rule:line-length
+ group: composed-gradle-verify-clm${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
+ cancel-in-progress: true
+jobs:
+ prepare:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Clear votes
+ # yamllint disable-line rule:line-length
+ uses: lfit/gerrit-review-action@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6
+ with:
+ host: ${{ vars.GERRIT_SERVER }}
+ username: ${{ vars.GERRIT_SSH_USER }}
+ key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+ known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+ gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ vote-type: clear
+ comment-only: true
+ - name: Allow replication
+ run: sleep 10s
+ gradle-verify-clm:
+ needs: prepare
+ # yamllint disable-line rule:line-length
+ uses: lfit/releng-reusable-workflows/.github/workflows/composed-gradle-nexus-iq.yaml@main
+ with:
+ GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
+ GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
+ GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
+ GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
+ GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
+ GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
+ GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
+ secrets:
+ NEXUS_IQ_PASSWORD: ${{ secrets.NEXUS_IQ_PASSWORD }}
+ vote:
+ if: ${{ always() }}
+ # yamllint enable rule:line-length
+ needs: [prepare, gradle-verify-clm]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Get conclusion
+ # yamllint disable-line rule:line-length
+ uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # v3.0.3
+ - name: Set vote
+ # yamllint disable-line rule:line-length
+ uses: lfit/gerrit-review-action@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6
+ with:
+ host: ${{ vars.GERRIT_SERVER }}
+ username: ${{ vars.GERRIT_SSH_USER }}
+ key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+ known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+ gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+ gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+ vote-type: ${{ env.WORKFLOW_CONCLUSION }}
+ comment-only: true \ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 54f80b2..934edf7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,5 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
plugins {
- id 'org.onap.portal.history.java-application-conventions'
+ id 'org.onap.portalng.history.java-application-conventions'
id 'io.spring.dependency-management'
id 'org.springframework.boot'
id 'jacoco'
@@ -11,6 +8,21 @@ plugins {
}
apply from: "${rootDir}/gradle/verify-licenses.gradle"
+def appVersion = getAppVersion()
+sourceCompatibility = '17'
+targetCompatibility = '17'
+
+springBoot {
+ buildInfo {
+ properties {
+ artifact = "org-onap-portalng-history"
+ version = appVersion
+ group = "org.onap.portalng"
+ name = "History service that saves user actions"
+ }
+ }
+}
+
configurations {
compileOnly {
extendsFrom annotationProcessor
@@ -78,7 +90,7 @@ jacocoTestReport {
application {
// Define the main class for the application.
- mainClass = 'org.onap.portal.history.HistoryApplication'
+ mainClass = 'org.onap.portalng.history.HistoryApplication'
}
sourceCompatibility = '17'
@@ -97,13 +109,17 @@ license {
}
configurations.implementation.setCanBeResolved(true)
-springBoot {
- buildInfo {
- properties {
- artifact = "org-onap-portalng-history"
- version = rootProject.file('version').text.trim()
- group = rootProject.group
- name = "History service that saves user actions"
- }
- }
+def String getAppVersion() {
+ Properties versionProperties = getVersionProperties()
+ String major = versionProperties.getProperty('major')
+ String minor = versionProperties.getProperty('minor')
+ String patch = versionProperties.getProperty('patch')
+ return major + '.' + minor + '.' + patch
+}
+def Properties getVersionProperties() {
+ def versionProperties = new Properties()
+ rootProject.file('version.properties').withInputStream {
+ versionProperties.load(it)
+ }
+ return versionProperties
} \ No newline at end of file
diff --git a/app/src/main/java/org/onap/portal/history/HistoryApplication.java b/app/src/main/java/org/onap/portalng/history/HistoryApplication.java
index 307d883..1a9cd8e 100644
--- a/app/src/main/java/org/onap/portal/history/HistoryApplication.java
+++ b/app/src/main/java/org/onap/portalng/history/HistoryApplication.java
@@ -22,11 +22,11 @@
/*
* This Java source file was generated by the Gradle 'init' task.
*/
-package org.onap.portal.history;
+package org.onap.portalng.history;
-import org.onap.portal.history.configuration.HistoryConfig;
-import org.onap.portal.history.logging.LoggerProperties;
+import org.onap.portalng.history.configuration.HistoryConfig;
+import org.onap.portalng.history.logging.LoggerProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/BeansConfig.java b/app/src/main/java/org/onap/portalng/history/configuration/BeansConfig.java
index 9a60681..a1fb5f2 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/BeansConfig.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/BeansConfig.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/Errorhandler.java b/app/src/main/java/org/onap/portalng/history/configuration/Errorhandler.java
index 583420b..515935b 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/Errorhandler.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/Errorhandler.java
@@ -19,11 +19,12 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.onap.portal.history.exception.ProblemException;
+
+import org.onap.portalng.history.exception.ProblemException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
import org.springframework.core.io.buffer.DataBufferFactory;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/HistoryConfig.java b/app/src/main/java/org/onap/portalng/history/configuration/HistoryConfig.java
index f70a9d4..c790288 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/HistoryConfig.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/HistoryConfig.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/RequestIdInterceptor.java b/app/src/main/java/org/onap/portalng/history/configuration/RequestIdInterceptor.java
index aa1fd4e..291e5e6 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/RequestIdInterceptor.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/RequestIdInterceptor.java
@@ -19,9 +19,9 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
-import org.onap.portal.history.util.Logger;
+import org.onap.portalng.history.util.Logger;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.reactive.ServerWebExchangeContextFilter;
import org.springframework.web.server.ServerWebExchange;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/SchedulerConfig.java b/app/src/main/java/org/onap/portalng/history/configuration/SchedulerConfig.java
index 88531af..81299b1 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/SchedulerConfig.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/SchedulerConfig.java
@@ -19,10 +19,11 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
-import org.onap.portal.history.services.ActionsService;
import lombok.extern.slf4j.Slf4j;
+
+import org.onap.portalng.history.services.ActionsService;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
diff --git a/app/src/main/java/org/onap/portal/history/configuration/SecurityConfig.java b/app/src/main/java/org/onap/portalng/history/configuration/SecurityConfig.java
index e825295..9d17bba 100644
--- a/app/src/main/java/org/onap/portal/history/configuration/SecurityConfig.java
+++ b/app/src/main/java/org/onap/portalng/history/configuration/SecurityConfig.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.configuration;
+package org.onap.portalng.history.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/app/src/main/java/org/onap/portal/history/controller/ActionsController.java b/app/src/main/java/org/onap/portalng/history/controller/ActionsController.java
index ce781f5..dbab575 100644
--- a/app/src/main/java/org/onap/portal/history/controller/ActionsController.java
+++ b/app/src/main/java/org/onap/portalng/history/controller/ActionsController.java
@@ -19,17 +19,17 @@
*
*/
-package org.onap.portal.history.controller;
+package org.onap.portalng.history.controller;
import java.util.Optional;
-import org.onap.portal.history.configuration.HistoryConfig;
-import org.onap.portal.history.openapi.api.ActionsApi;
-import org.onap.portal.history.openapi.model.ActionResponse;
-import org.onap.portal.history.openapi.model.ActionsListResponse;
-import org.onap.portal.history.openapi.model.CreateActionRequest;
-import org.onap.portal.history.services.ActionsService;
-import org.onap.portal.history.util.IdTokenExchange;
+import org.onap.portalng.history.openapi.api.ActionsApi;
+import org.onap.portalng.history.openapi.model.ActionResponse;
+import org.onap.portalng.history.openapi.model.ActionsListResponse;
+import org.onap.portalng.history.openapi.model.CreateActionRequest;
+import org.onap.portalng.history.configuration.HistoryConfig;
+import org.onap.portalng.history.services.ActionsService;
+import org.onap.portalng.history.util.IdTokenExchange;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.server.ServerWebExchange;
diff --git a/app/src/main/java/org/onap/portal/history/entities/ActionsDao.java b/app/src/main/java/org/onap/portalng/history/entities/ActionsDao.java
index 5457e87..127e093 100644
--- a/app/src/main/java/org/onap/portal/history/entities/ActionsDao.java
+++ b/app/src/main/java/org/onap/portalng/history/entities/ActionsDao.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.entities;
+package org.onap.portalng.history.entities;
import lombok.Getter;
import lombok.Setter;
diff --git a/app/src/main/java/org/onap/portal/history/exception/ProblemException.java b/app/src/main/java/org/onap/portalng/history/exception/ProblemException.java
index f51d246..8c71ce4 100644
--- a/app/src/main/java/org/onap/portal/history/exception/ProblemException.java
+++ b/app/src/main/java/org/onap/portalng/history/exception/ProblemException.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.exception;
+package org.onap.portalng.history.exception;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/app/src/main/java/org/onap/portal/history/logging/LogContextVariable.java b/app/src/main/java/org/onap/portalng/history/logging/LogContextVariable.java
index 76cb29e..1b1c505 100644
--- a/app/src/main/java/org/onap/portal/history/logging/LogContextVariable.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/LogContextVariable.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
import lombok.Getter;
diff --git a/app/src/main/java/org/onap/portal/history/logging/LoggerProperties.java b/app/src/main/java/org/onap/portalng/history/logging/LoggerProperties.java
index c142b4f..f785822 100644
--- a/app/src/main/java/org/onap/portal/history/logging/LoggerProperties.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/LoggerProperties.java
@@ -1,4 +1,4 @@
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
import java.util.List;
diff --git a/app/src/main/java/org/onap/portal/history/logging/LoggingHelper.java b/app/src/main/java/org/onap/portalng/history/logging/LoggingHelper.java
index e587959..90c61c4 100644
--- a/app/src/main/java/org/onap/portal/history/logging/LoggingHelper.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/LoggingHelper.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/app/src/main/java/org/onap/portal/history/logging/ReactiveRequestLoggingFilter.java b/app/src/main/java/org/onap/portalng/history/logging/ReactiveRequestLoggingFilter.java
index 059e573..91df0c1 100644
--- a/app/src/main/java/org/onap/portal/history/logging/ReactiveRequestLoggingFilter.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/ReactiveRequestLoggingFilter.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
diff --git a/app/src/main/java/org/onap/portal/history/logging/StatusCode.java b/app/src/main/java/org/onap/portalng/history/logging/StatusCode.java
index 1c93bd9..9feae4d 100644
--- a/app/src/main/java/org/onap/portal/history/logging/StatusCode.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/StatusCode.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
public enum StatusCode {
REQUEST,
diff --git a/app/src/main/java/org/onap/portal/history/logging/WebExchangeUtils.java b/app/src/main/java/org/onap/portalng/history/logging/WebExchangeUtils.java
index 8efda9c..c92564e 100644
--- a/app/src/main/java/org/onap/portal/history/logging/WebExchangeUtils.java
+++ b/app/src/main/java/org/onap/portalng/history/logging/WebExchangeUtils.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.logging;
+package org.onap.portalng.history.logging;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/app/src/main/java/org/onap/portal/history/repository/ActionsRepository.java b/app/src/main/java/org/onap/portalng/history/repository/ActionsRepository.java
index 79fc378..d0dcc44 100644
--- a/app/src/main/java/org/onap/portal/history/repository/ActionsRepository.java
+++ b/app/src/main/java/org/onap/portalng/history/repository/ActionsRepository.java
@@ -19,11 +19,11 @@
*
*/
-package org.onap.portal.history.repository;
+package org.onap.portalng.history.repository;
import java.util.Date;
-import org.onap.portal.history.entities.ActionsDao;
+import org.onap.portalng.history.entities.ActionsDao;
import org.springframework.data.domain.Pageable;
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
diff --git a/app/src/main/java/org/onap/portal/history/services/ActionsService.java b/app/src/main/java/org/onap/portalng/history/services/ActionsService.java
index a14fef2..746b108 100644
--- a/app/src/main/java/org/onap/portal/history/services/ActionsService.java
+++ b/app/src/main/java/org/onap/portalng/history/services/ActionsService.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.services;
+package org.onap.portalng.history.services;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -27,13 +27,13 @@ import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Date;
-import org.onap.portal.history.entities.ActionsDao;
-import org.onap.portal.history.exception.ProblemException;
-import org.onap.portal.history.openapi.model.ActionResponse;
-import org.onap.portal.history.openapi.model.ActionsListResponse;
-import org.onap.portal.history.openapi.model.CreateActionRequest;
-import org.onap.portal.history.repository.ActionsRepository;
-import org.onap.portal.history.util.Logger;
+import org.onap.portalng.history.openapi.model.ActionResponse;
+import org.onap.portalng.history.openapi.model.ActionsListResponse;
+import org.onap.portalng.history.openapi.model.CreateActionRequest;
+import org.onap.portalng.history.entities.ActionsDao;
+import org.onap.portalng.history.exception.ProblemException;
+import org.onap.portalng.history.repository.ActionsRepository;
+import org.onap.portalng.history.util.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
diff --git a/app/src/main/java/org/onap/portal/history/util/IdTokenExchange.java b/app/src/main/java/org/onap/portalng/history/util/IdTokenExchange.java
index 82cc67a..91db5f9 100644
--- a/app/src/main/java/org/onap/portal/history/util/IdTokenExchange.java
+++ b/app/src/main/java/org/onap/portalng/history/util/IdTokenExchange.java
@@ -19,14 +19,14 @@
*
*/
-package org.onap.portal.history.util;
+package org.onap.portalng.history.util;
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.JWTParser;
import java.text.ParseException;
-import org.onap.portal.history.exception.ProblemException;
+import org.onap.portalng.history.exception.ProblemException;
import org.springframework.web.server.ServerWebExchange;
import org.zalando.problem.Problem;
import org.zalando.problem.Status;
diff --git a/app/src/main/java/org/onap/portal/history/util/Logger.java b/app/src/main/java/org/onap/portalng/history/util/Logger.java
index c072c16..f1cb150 100644
--- a/app/src/main/java/org/onap/portal/history/util/Logger.java
+++ b/app/src/main/java/org/onap/portalng/history/util/Logger.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.util;
+package org.onap.portalng.history.util;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpMethod;
diff --git a/app/src/test/java/org/onap/portal/history/BaseIntegrationTest.java b/app/src/test/java/org/onap/portalng/history/BaseIntegrationTest.java
index feee00c..ec682dd 100644
--- a/app/src/test/java/org/onap/portal/history/BaseIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/history/BaseIntegrationTest.java
@@ -19,18 +19,19 @@
*
*/
-package org.onap.portal.history;
+package org.onap.portalng.history;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.tomakehurst.wiremock.client.WireMock;
import com.nimbusds.jose.jwk.JWKSet;
-import org.onap.portal.history.util.IdTokenExchange;
+
import io.restassured.RestAssured;
import io.restassured.filter.log.RequestLoggingFilter;
import io.restassured.filter.log.ResponseLoggingFilter;
import io.restassured.specification.RequestSpecification;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
+import org.onap.portalng.history.util.IdTokenExchange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/app/src/test/java/org/onap/portal/history/TokenGenerator.java b/app/src/test/java/org/onap/portalng/history/TokenGenerator.java
index 986507c..1887682 100644
--- a/app/src/test/java/org/onap/portal/history/TokenGenerator.java
+++ b/app/src/test/java/org/onap/portalng/history/TokenGenerator.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history;
+package org.onap.portalng.history;
import com.nimbusds.jose.JOSEObjectType;
import com.nimbusds.jose.JWSAlgorithm;
diff --git a/app/src/test/java/org/onap/portal/history/actions/ActionDto.java b/app/src/test/java/org/onap/portalng/history/actions/ActionDto.java
index 2deec8e..b2b7cd4 100644
--- a/app/src/test/java/org/onap/portal/history/actions/ActionDto.java
+++ b/app/src/test/java/org/onap/portalng/history/actions/ActionDto.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.actions;
+package org.onap.portalng.history.actions;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/app/src/test/java/org/onap/portal/history/actions/ActionFixtures.java b/app/src/test/java/org/onap/portalng/history/actions/ActionFixtures.java
index efab59a..4137a58 100644
--- a/app/src/test/java/org/onap/portal/history/actions/ActionFixtures.java
+++ b/app/src/test/java/org/onap/portalng/history/actions/ActionFixtures.java
@@ -19,15 +19,15 @@
*
*/
-package org.onap.portal.history.actions;
+package org.onap.portalng.history.actions;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.onap.portal.history.entities.ActionsDao;
-import org.onap.portal.history.openapi.model.CreateActionRequest;
+import org.onap.portalng.history.openapi.model.CreateActionRequest;
+import org.onap.portalng.history.entities.ActionsDao;
public class ActionFixtures {
diff --git a/app/src/test/java/org/onap/portal/history/actions/ActionsControllerIntegrationTest.java b/app/src/test/java/org/onap/portalng/history/actions/ActionsControllerIntegrationTest.java
index feab695..317f582 100644
--- a/app/src/test/java/org/onap/portal/history/actions/ActionsControllerIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/history/actions/ActionsControllerIntegrationTest.java
@@ -19,7 +19,7 @@
*
*/
-package org.onap.portal.history.actions;
+package org.onap.portalng.history.actions;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,14 +33,14 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.portal.history.BaseIntegrationTest;
-import org.onap.portal.history.entities.ActionsDao;
-import org.onap.portal.history.openapi.model.ActionResponse;
-import org.onap.portal.history.openapi.model.ActionsListResponse;
-import org.onap.portal.history.openapi.model.CreateActionRequest;
-import org.onap.portal.history.openapi.model.Problem;
-import org.onap.portal.history.repository.ActionsRepository;
-import org.onap.portal.history.services.ActionsService;
+import org.onap.portalng.history.BaseIntegrationTest;
+import org.onap.portalng.history.openapi.model.ActionResponse;
+import org.onap.portalng.history.openapi.model.ActionsListResponse;
+import org.onap.portalng.history.openapi.model.CreateActionRequest;
+import org.onap.portalng.history.openapi.model.Problem;
+import org.onap.portalng.history.entities.ActionsDao;
+import org.onap.portalng.history.repository.ActionsRepository;
+import org.onap.portalng.history.services.ActionsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
diff --git a/buildSrc/src/main/groovy/org.onap.portal.history.java-application-conventions.gradle b/buildSrc/src/main/groovy/org.onap.portalng.history.java-application-conventions.gradle
index be78cf2..59fbf68 100644
--- a/buildSrc/src/main/groovy/org.onap.portal.history.java-application-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.onap.portalng.history.java-application-conventions.gradle
@@ -4,7 +4,7 @@
plugins {
// Apply the common convention plugin for shared build configuration between library and application projects.
- id 'org.onap.portal.history.java-common-conventions'
+ id 'org.onap.portalng.history.java-common-conventions'
// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
diff --git a/buildSrc/src/main/groovy/org.onap.portal.history.java-common-conventions.gradle b/buildSrc/src/main/groovy/org.onap.portalng.history.java-common-conventions.gradle
index ee5af57..ee5af57 100644
--- a/buildSrc/src/main/groovy/org.onap.portal.history.java-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.onap.portalng.history.java-common-conventions.gradle
diff --git a/buildSrc/src/main/groovy/org.onap.portal.history.java-library-conventions.gradle b/buildSrc/src/main/groovy/org.onap.portalng.history.java-library-conventions.gradle
index 24ddad6..0d6eaf4 100644
--- a/buildSrc/src/main/groovy/org.onap.portal.history.java-library-conventions.gradle
+++ b/buildSrc/src/main/groovy/org.onap.portalng.history.java-library-conventions.gradle
@@ -4,7 +4,7 @@
plugins {
// Apply the common convention plugin for shared build configuration between library and application projects.
- id 'org.onap.portal.history.java-common-conventions'
+ id 'org.onap.portalng.history.java-common-conventions'
// Apply the java-library plugin for API and implementation separation.
id 'java-library'
diff --git a/openapi/build.gradle b/openapi/build.gradle
index 7ec2657..47c8f75 100644
--- a/openapi/build.gradle
+++ b/openapi/build.gradle
@@ -1,5 +1,5 @@
plugins {
- id 'org.onap.portal.history.java-application-conventions'
+ id 'org.onap.portalng.history.java-application-conventions'
id 'org.openapi.generator'
}
@@ -8,9 +8,9 @@ ext {
}
dependencies {
- implementation "org.openapitools:openapi-generator:$openapiVersion"
+ compileOnly "org.openapitools:openapi-generator:$openapiVersion"
constraints {
- implementation('jakarta.validation:jakarta.validation-api:3.0.2') {
+ compileOnly('jakarta.validation:jakarta.validation-api:3.0.2') {
because 'because min max validation wouldnt work with older versions of dependency'
}
}
@@ -37,9 +37,9 @@ openApiGenerate {
generateApiDocumentation = false
generateModelTests = false
generateModelDocumentation = false
- invokerPackage = "org.onap.portal.history.openapi"
- apiPackage = "org.onap.portal.history.openapi.api"
- modelPackage = "org.onap.portal.history.openapi.model"
+ invokerPackage = "org.onap.portalng.history.openapi"
+ apiPackage = "org.onap.portalng.history.openapi.api"
+ modelPackage = "org.onap.portalng.history.openapi.model"
}
compileJava {
diff --git a/releases/0.1.0-container-release.yaml b/releases/0.1.0-container-release.yaml
new file mode 100644
index 0000000..0f02ef8
--- /dev/null
+++ b/releases/0.1.0-container-release.yaml
@@ -0,0 +1,7 @@
+distribution_type: container
+container_release_tag: 0.1.0
+project: portal-ng/history
+ref: 0cf60eed31737a347071f057230fcd313c5a3c4c
+containers:
+ - name: portal-ng/history
+ version: latest
diff --git a/version b/version
deleted file mode 100644
index 6e8bf73..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.0
diff --git a/version.properties b/version.properties
new file mode 100644
index 0000000..c946966
--- /dev/null
+++ b/version.properties
@@ -0,0 +1,10 @@
+# Versioning variables
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
+# because they are used in Jenkins, whose plug-in doesn't support
+major=0
+minor=1
+patch=0
+base_version=${major}.${minor}.${patch}
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file