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.

Sign up for GitHub

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

Migrate to 6.1 with retro compatibility #123

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Migrate to 6.1 with retro compatibility #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
383fb26
Migration to 6.1 - WIP
lh-lilahamel Nov 13, 2024
54b401b
fix many tests
lh-lilahamel Nov 19, 2024
bf598be
fix more tests
lh-lilahamel Nov 22, 2024
d18bde6
fix content service
lh-lilahamel Nov 29, 2024
476ea4c
custom deserializer
lh-lilahamel Dec 2, 2024
670da99
fix code smells
lh-lilahamel Dec 5, 2024
feaaf8f
Clean the code after the review
OPeyrusse Dec 5, 2024
e86ed5a
Use an event to setup the registry
OPeyrusse Dec 5, 2024
5365931
Refactor security a bit
OPeyrusse Dec 5, 2024
0d92236
provide continuous build
lh-lilahamel Dec 12, 2024
370795d
Merge branch 'main' into task/PIVOT-10380-upgrade-pivot-server-6.1
OPeyrusse Dec 20, 2024
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
112 changes: 65 additions & 47 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.18</version>
<version>3.2.10</version>
<relativePath/>
</parent>

<groupId>com.activeviam.tools</groupId>
<artifactId>mac</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
<name>Atoti Server Memory Analysis Cube</name>

<licenses>
Expand All @@ -23,12 +23,11 @@
</licenses>

<properties>
<jdk.version>11</jdk.version>
<jdk.version>21</jdk.version>

<atoti-server.version>6.0.10</atoti-server.version>
<atoti-ui.version>5.1.13</atoti-ui.version>
<atoti-server.version>6.1.3-1733969770-ef208661</atoti-server.version>

<tomcat.version>9.0.31</tomcat.version>
<tomcat.version>10.1.30</tomcat.version>

<spring.boot.mainclass>com.activeviam.mac.app.MacSpringBootApp</spring.boot.mainclass>

Expand All @@ -46,49 +45,41 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
<version>3.2.10</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- ActivePivot Dependencies -->
<dependency>
<groupId>com.activeviam.activepivot</groupId>
<artifactId>activepivot-server-spring</artifactId>
</dependency>

<!-- Composer dependencies are provided in QFS artifacts -->
<!-- And must be explicitly declared in application projects -->
<dependency>
<groupId>com.activeviam.tech</groupId>
<artifactId>composer-intf</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.activeviam.tech</groupId>
<artifactId>composer-impl</artifactId>
<scope>compile</scope>
<groupId>com.activeviam.springboot</groupId>
<artifactId>atoti-server-starter</artifactId>
<version>${atoti-server.version}</version>
</dependency>
<!-- The following artifact allows to expose the Rest API of the content
service -->
<dependency>
<groupId>com.activeviam.tech</groupId>
<artifactId>content-server-spring</artifactId>
<groupId>com.activeviam.springboot</groupId>
<artifactId>atoti-ui-starter</artifactId>
<version>${atoti-server.version}</version>
</dependency>
<dependency>
<groupId>com.activeviam.web</groupId>
<artifactId>activeviam-web-spring</artifactId>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- Dependencies for the content service persistence -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>6.4.10.Final</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -97,14 +88,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
</dependency>

<!-- Atoti UI dependency -->
<dependency>
<groupId>com.activeviam.activeui</groupId>
<artifactId>activeui</artifactId>
<version>${atoti-ui.version}</version>
<scope>runtime</scope>
<version>6.4.10.Final</version>
</dependency>

<!-- SpringBoot dependencies -->
Expand Down Expand Up @@ -149,11 +133,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -170,6 +149,45 @@
<version>32.1.3-jre</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.activeviam.source</groupId>
<artifactId>csv-source</artifactId>
<version>${atoti-server.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.27.1</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>${jakarta-persistence.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta-ws-rs.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
9 changes: 1 addition & 8 deletions src/main/java/com/activeviam/mac/app/MacSpringBootApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
package com.activeviam.mac.app;

import com.activeviam.mac.cfg.impl.MacServerConfig;
import com.quartetfs.fwk.Registry;
import com.quartetfs.fwk.contributions.impl.ClasspathContributionProvider;
import javax.servlet.MultipartConfigElement;
import jakarta.servlet.MultipartConfigElement;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
Expand All @@ -36,11 +34,6 @@
@Import({MacServerConfig.class})
public class MacSpringBootApp {

/* Before anything else we statically initialize the Quartet FS Registry. */
static {
Registry.setContributionProvider(new ClasspathContributionProvider());
}

/**
* Starts the Memory Analysis Cube application.
*
Expand Down
48 changes: 48 additions & 0 deletions src/main/java/com/activeviam/mac/cfg/impl/ActivePivotWithDatastoreConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.activeviam.mac.cfg.impl;

import com.activeviam.activepivot.core.datastore.api.builder.ApplicationWithDatastore;
import com.activeviam.activepivot.core.datastore.api.builder.StartBuilding;
import com.activeviam.activepivot.core.intf.api.cube.IActivePivotManager;
import com.activeviam.activepivot.server.spring.api.config.IActivePivotBranchPermissionsManagerConfig;
import com.activeviam.activepivot.server.spring.api.config.IActivePivotConfig;
import com.activeviam.activepivot.server.spring.api.config.IActivePivotManagerDescriptionConfig;
import com.activeviam.activepivot.server.spring.api.config.IDatastoreConfig;
import com.activeviam.activepivot.server.spring.api.config.IDatastoreSchemaDescriptionConfig;
import com.activeviam.database.datastore.api.IDatastore;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
@RequiredArgsConstructor
public class ActivePivotWithDatastoreConfig implements IDatastoreConfig, IActivePivotConfig {

private final IActivePivotManagerDescriptionConfig apManagerConfig;

private final IDatastoreSchemaDescriptionConfig datastoreDescriptionConfig;

private final IActivePivotBranchPermissionsManagerConfig branchPermissionsManagerConfig;

@Bean
protected ApplicationWithDatastore applicationWithDatastore() {
return StartBuilding.application()
.withDatastore(this.datastoreDescriptionConfig.datastoreSchemaDescription())
.withManager(this.apManagerConfig.managerDescription())
.withEpochPolicy(this.apManagerConfig.epochManagementPolicy())
.withBranchPermissionsManager(
this.branchPermissionsManagerConfig.branchPermissionsManager())
.build();
}

@Bean
@Override
public IActivePivotManager activePivotManager() {
return applicationWithDatastore().getManager();
}

@Bean
@Override
public IDatastore database() {
return applicationWithDatastore().getDatastore();
}
}
109 changes: 0 additions & 109 deletions src/main/java/com/activeviam/mac/cfg/impl/ActiveUiResourceServerConfig.java
View file
Open in desktop

This file was deleted.

Loading
Loading