Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task nxp 32774 lts 2025 #291

Draft
wants to merge 4 commits into
base: lts-2023
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

# Sync when a commit is done on the reference branches
push:
branches: ["lts-2023"]
branches: ["lts-2025"]
paths:
- 'nuxeo-coldstorage-web/i18n/messages.json'

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://jenkins.platform.dev.nuxeo.com/buildStatus/icon?job=coldstorage%2Fnuxeo-coldstorage%2Flts-2023)](https://jenkins.platform.dev.nuxeo.com/job/coldstorage/job/nuxeo-coldstorage/job/lts-2023/)
[![Build Status](https://jenkins.platform.dev.nuxeo.com/buildStatus/icon?job=coldstorage%2Fnuxeo-coldstorage%2Flts-2025)](https://jenkins.platform.dev.nuxeo.com/job/coldstorage/job/nuxeo-coldstorage/job/lts-2025/)

# Nuxeo Cold Storage

Expand Down Expand Up @@ -160,7 +160,7 @@ Continuous Integration & Continuous Deployment(and Delivery) are an important pa
Nuxeo Cold Storage integrates [Jenkins pipelines](https://jenkins.platform.dev.nuxeo.com/job/coldstorage/job/nuxeo-coldstorage/) for each maintenance branch, for _LTS_ (fast track) and also for each opened PR.

The following features are available:
- Each PR merge to _10.10_/_lts-2021_/_lts-2023_ branches will generate a "release candidate" package
- Each PR merge to _10.10_/_lts-2021_/_lts-2023_/_lts-2025_ branches will generate a "release candidate" package

### Localization Management

Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfiles/build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Closure buildUnitTestStage(env) {

pipeline {
agent {
label 'jenkins-nuxeo-package-lts-2023-nodejs18'
label 'jenkins-nuxeo-package-lts-2025'
}
options {
buildDiscarder(logRotator(daysToKeepStr: '60', numToKeepStr: '60', artifactNumToKeepStr: '5'))
Expand Down
4 changes: 2 additions & 2 deletions ci/Jenkinsfiles/release.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ library identifier: "[email protected]"

pipeline {
agent {
label 'jenkins-nuxeo-package-lts-2023-nodejs18'
label 'jenkins-nuxeo-package-lts-2025'
}
options {
buildDiscarder(logRotator(daysToKeepStr: '60', numToKeepStr: '60', artifactNumToKeepStr: '5'))
Expand All @@ -33,7 +33,7 @@ pipeline {
environment {
BRANCH_NAME = "${params.BRANCH}"
BUILD_VERSION = "${params.BUILD_VERSION}"
JIRA_NUXEO_ADDON_MOVING_VERSION = 'coldstorage-2023.x'
JIRA_NUXEO_ADDON_MOVING_VERSION = 'coldstorage-2025.x'
VERSION = "${nxUtils.getMajorDotMinorVersion(version: env.BUILD_VERSION)}"
}
stages {
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NUXEO_VERSION=2023
ARG NUXEO_VERSION=2025

FROM docker-private.packages.nuxeo.com/nuxeo/nuxeo:${NUXEO_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion nuxeo-coldstorage-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.nuxeo.coldstorage</groupId>
<artifactId>nuxeo-coldstorage-parent</artifactId>
<version>2023.4-SNAPSHOT</version>
<version>2025.0-SNAPSHOT</version>
</parent>

<artifactId>nuxeo-coldstorage-package</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion nuxeo-coldstorage-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.nuxeo.coldstorage</groupId>
<artifactId>nuxeo-coldstorage-parent</artifactId>
<version>2023.4-SNAPSHOT</version>
<version>2025.0-SNAPSHOT</version>
</parent>
<artifactId>nuxeo-coldstorage-web</artifactId>
<name>Nuxeo Cold Storage WebUI integration</name>
Expand Down
2 changes: 1 addition & 1 deletion nuxeo-coldstorage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.nuxeo.coldstorage</groupId>
<artifactId>nuxeo-coldstorage-parent</artifactId>
<version>2023.4-SNAPSHOT</version>
<version>2025.0-SNAPSHOT</version>
</parent>

<groupId>org.nuxeo.coldstorage</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.nuxeo.coldstorage.events;

import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

package org.nuxeo.coldstorage.service;

import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
import static org.nuxeo.coldstorage.ColdStorageConstants.COLD_STORAGE_BEING_RETRIEVED_PROPERTY;
import static org.nuxeo.coldstorage.ColdStorageConstants.COLD_STORAGE_CONTENT_ARCHIVE_LOCATION_MAIL_TEMPLATE_KEY;
import static org.nuxeo.coldstorage.ColdStorageConstants.COLD_STORAGE_CONTENT_AVAILABLE_EVENT_NAME;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.io.Serializable;
import java.util.List;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.junit.runner.RunWith;
import org.nuxeo.coldstorage.ColdStorageConstants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

package org.nuxeo.coldstorage.operations;

import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static javax.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_PRECONDITION_FAILED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
Expand All @@ -37,7 +37,7 @@
import java.util.List;
import java.util.UUID;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.junit.Test;
import org.nuxeo.coldstorage.ColdStorageConstants;
Expand Down Expand Up @@ -65,6 +65,7 @@
*/
@Features(DummyColdStorageFeature.class)
public class MoveToColdStorageTest extends AbstractTestColdStorageOperation {

@Inject
protected CoreSession session;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.nuxeo.coldstorage.operations;

import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
Expand All @@ -31,9 +31,10 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import javax.security.auth.login.LoginException;

import jakarta.inject.Inject;

import org.junit.Test;
import org.nuxeo.coldstorage.ColdStorageConstants;
import org.nuxeo.coldstorage.DummyColdStorageFeature;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.nuxeo.coldstorage.operations;

import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
import static jakarta.servlet.http.HttpServletResponse.SC_CONFLICT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Expand All @@ -30,7 +30,7 @@
import java.io.IOException;
import java.util.List;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.junit.Test;
import org.nuxeo.coldstorage.ColdStorageConstants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.nuxeo.coldstorage.operations;

import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
Expand All @@ -30,7 +30,7 @@
import java.util.List;
import java.util.stream.Collectors;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.junit.Test;
import org.nuxeo.coldstorage.ColdStorageConstants;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.nuxeo.coldstorage.service;

import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Expand All @@ -46,7 +46,7 @@
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.apache.commons.collections.CollectionUtils;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.inject.Inject;
import jakarta.inject.Inject;

import org.apache.commons.lang3.time.DateUtils;
import org.apache.logging.log4j.Level;
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>org.nuxeo</groupId>
<artifactId>nuxeo-parent</artifactId>
<version>2023.14</version>
<version>2025.0-SNAPSHOT</version>
</parent>

<groupId>org.nuxeo.coldstorage</groupId>
<artifactId>nuxeo-coldstorage-parent</artifactId>
<name>Nuxeo Cold Storage Parent</name>
<version>2023.4-SNAPSHOT</version>
<version>2025.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Nuxeo Cold Storage allows the cold storage of document content. This can be needed for archiving,
compliance, etc.
Expand Down