Skip to content

Commit

Permalink
feat: Centralize Cache configuration in Meeds package and Add newly b…
Browse files Browse the repository at this point in the history 
…anned dependencies - #2537 (#2561)

This change will centralize the Cache configuration into Meeds package
to ease its maintainability and evolutivity. In fact, this will allow to
override the Meeds caches configurations by one single file override.
In addition, this change will delete a useless artifact `exo-plf-tools`.
  • Loading branch information
@boubaker
boubaker committed Nov 15, 2024
1 parent 74ccc9d commit 454130e
Show file tree
Hide file tree
Showing 16 changed files with 1,228 additions and 689 deletions.
34 changes: 0 additions & 34 deletions packaging/plf-assemblies/src/main/resources/assemblies/plf-exo-tools-component.xml
View file

This file was deleted.

1 change: 0 additions & 1 deletion ...lies/src/main/resources/assemblies/plf-standalone-default-tomcat-distribution-content.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,5 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<componentDescriptors>
<componentDescriptor>assemblies/plf-copy-libraries-component.xml</componentDescriptor>
<componentDescriptor>assemblies/plf-addons-component.xml</componentDescriptor>
<componentDescriptor>assemblies/plf-exo-tools-component.xml</componentDescriptor>
</componentDescriptors>
</assembly>
125 changes: 4 additions & 121 deletions packaging/plf-community-tomcat-standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
<type>zip</type>
<scope>runtime</scope>
</dependency>
<!-- PLF-6510: Get exo-tools.jar used by PLF startup scripts -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-exo-tools</artifactId>
<scope>runtime</scope>
</dependency>
<!-- Build resource used to import license related files -->
<dependency>
<groupId>org.exoplatform.resources</groupId>
Expand All @@ -67,126 +61,15 @@
<version>${version.exo-lgpl-license-resource-bundle}</version>
<scope>runtime</scope>
</dependency>
<!-- Pre-bundled addons -->
<dependency>
<groupId>io.meeds.wallet</groupId>
<artifactId>wallet-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.kudos</groupId>
<artifactId>kudos-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.perk-store</groupId>
<artifactId>perk-store-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.gamification</groupId>
<artifactId>gamification-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.app-center</groupId>
<artifactId>app-center-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.notes</groupId>
<artifactId>notes-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.task</groupId>
<artifactId>task-management-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.analytics</groupId>
<artifactId>analytics-packaging</artifactId>
<scope>provided</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>io.meeds.poll</groupId>
<artifactId>poll-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.content</groupId>
<artifactId>content-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.gamification-github</groupId>
<artifactId>gamification-github-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.gamification-twitter</groupId>
<artifactId>gamification-twitter-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.gamification-evm</groupId>
<artifactId>gamification-evm-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.deeds-tenant</groupId>
<artifactId>deeds-tenant-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.layout</groupId>
<artifactId>layout-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.gamification-crowdin</groupId>
<artifactId>gamification-crowdin-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.pwa</groupId>
<artifactId>pwa-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.meeds.ide</groupId>
<artifactId>ide-packaging</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<!-- The name that we'll use for our distribution directory -->
<finalName>meeds-community-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
66 changes: 66 additions & 0 deletions packaging/plf-dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,70 +33,136 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<artifactId>portal.web.portal</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.meeds.portal</groupId>
<artifactId>portal.web.rest</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Commons -->
<dependency>
<groupId>io.meeds.commons</groupId>
<artifactId>commons-comet-webapp</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.meeds.commons</groupId>
<artifactId>commons-extension-webapp</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Platform UI -->
<dependency>
<groupId>io.meeds.platform-ui</groupId>
<artifactId>platform-ui-skin</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Meeds.io Distrib -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-meeds-extension</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-sites-extension</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-root-webapp</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-tomcat-integration-webapp</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Meeds.io - common configuration for all distributions -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>plf-configuration</artifactId>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Social -->
<dependency>
<groupId>io.meeds.social</groupId>
<artifactId>social-webapp</artifactId>
<type>war</type>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.meeds.social</groupId>
Expand Down
Loading

0 comments on commit 454130e

Please sign in to comment.