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

Jump to bottom

Update push-notification Artifact - Meeds-7065 #62

Merged
merged 6 commits into from
Jul 1, 2024
Merged

Update push-notification Artifact - Meeds-7065 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c578a45
Rename push-notifications Artifact
halaya Jun 19, 2024
30ffeca
fix: Fix Packaging groupId - MEED-7065
boubaker Jun 20, 2024
c6c59e1
feat: Rename Meeds Artifact GroupId - MEED-7065
boubaker Jun 21, 2024
74b8a1d
Update parent-pom Artifact
halaya Jun 21, 2024
0d0c043
Update ArtifactId to use Meeds
boubaker Jun 26, 2024
9660f79
Fix Artifact naming convension
boubaker Jun 26, 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
20 changes: 10 additions & 10 deletions packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications</artifactId>
<groupId>io.meeds.push-notifications</groupId>
<artifactId>push-notifications</artifactId>
<version>7.0.x-SNAPSHOT</version>
</parent>
<artifactId>exo-push-notifications-addon-packaging</artifactId>
<name>eXo Push notifications addon - Packaging</name>
<artifactId>push-notifications-packaging</artifactId>
<name>Meeds:: Push notifications addon - Packaging</name>
<packaging>pom</packaging>
<description>eXo Push notifications addon packaging</description>
<description>Meeds Push notifications addon packaging</description>
<dependencies>
<dependency>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications-webapp</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>push-notifications-webapp</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications-service</artifactId>
<groupId>${project.groupId}</groupId>
<artifactId>push-notifications-service</artifactId>
<type>jar</type>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
6 changes: 3 additions & 3 deletions packaging/src/main/assemblies/assembly-addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>exo-push-notifications</id>
<id>push-notifications</id>
<formats>
<format>zip</format>
</formats>
Expand All @@ -30,7 +30,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>/</outputDirectory>
<includes>
<include>org.exoplatform.addons.push-notifications:exo-push-notifications-service:jar</include>
<include>${project.groupId}:*:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
Expand All @@ -40,7 +40,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>/</outputDirectory>
<includes>
<include>org.exoplatform.addons.push-notifications:exo-push-notifications-webapp:war</include>
<include>${project.groupId}:*:war</include>
</includes>
<outputFileNameMapping>push-notifications.war</outputFileNameMapping>
</dependencySet>
Expand Down
47 changes: 26 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>addons-parent-pom</artifactId>
<groupId>org.exoplatform.addons</groupId>
<version>18-M03</version>
<groupId>io.meeds.addons</groupId>
<version>18-M04</version>
</parent>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications</artifactId>
<groupId>io.meeds.push-notifications</groupId>
<artifactId>push-notifications</artifactId>
<version>7.0.x-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Add-on:: eXo Push notifications addon</name>
<description>eXo Push notifications addon</description>
<name>Meeds:: Add-on:: Push notifications addon</name>
<description>Meeds Push notifications addon</description>
<modules>
<module>war</module>
<module>packaging</module>
<module>service</module>
</modules>
<scm>
<connection>scm:git:git://github.com/exoplatform/push-notifications.git</connection>
<developerConnection>scm:git:[email protected]:exoplatform/push-notifications.git</developerConnection>
<connection>scm:git:git://github.com/meeds-io/push-notifications.git</connection>
<developerConnection>scm:git:[email protected]:meeds-io/push-notifications.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/exoplatform/push-notifications</url>
<url>https://github.com/meeds-io/push-notifications</url>
</scm>

<properties>
<!-- **************************************** -->
<!-- Dependencies versions -->
<!-- **************************************** -->
<org.exoplatform.social.version>7.0.x-SNAPSHOT</org.exoplatform.social.version>
<io.meeds.social.version>7.0.x-SNAPSHOT</io.meeds.social.version>

<!-- Sonar properties -->
<sonar.organization>meeds-io</sonar.organization>
Expand All @@ -55,26 +55,31 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<dependencies>
<!-- Import versions from platform project -->
<dependency>
<groupId>org.exoplatform.social</groupId>
<groupId>io.meeds.social</groupId>
<artifactId>social</artifactId>
<version>${org.exoplatform.social.version}</version>
<version>${io.meeds.social.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Declare our own artifacts -->
<dependency>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications-service</artifactId>
<version>${project.version}</version>
<type>jar</type>
<groupId>${project.groupId}</groupId>
<artifactId>push-notifications-service</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
<groupId>${project.groupId}</groupId>
<artifactId>push-notifications-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>push-notifications-packaging</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>

</dependencies>
</dependencyManagement>
<!-- This profile is used to allow github action to build branches. The github action is used for sonar analysis -->
Expand Down
15 changes: 8 additions & 7 deletions service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,32 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications</artifactId>
<groupId>io.meeds.push-notifications</groupId>
<artifactId>push-notifications</artifactId>
<version>7.0.x-SNAPSHOT</version>
</parent>
<artifactId>exo-push-notifications-service</artifactId>
<name>eXo Push notifications addon - Service</name>
<artifactId>push-notifications-service</artifactId>
<name>Meeds:: Push notifications addon - Service</name>

<properties>
<exo.test.coverage.ratio>0.35</exo.test.coverage.ratio>
</properties>

<dependencies>
<dependency>
<groupId>org.exoplatform.social</groupId>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-notification</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.social</groupId>
<groupId>io.meeds.social</groupId>
<artifactId>social-component-oauth-auth</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>com.jcabi</groupId>
Expand All @@ -62,7 +63,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<host>localhost:8080</host>
<basePath>/rest</basePath>
<info>
<title>eXo Push Notifications REST API</title>
<title>Meeds Push Notifications REST API</title>
<version>1</version>
<description>The Push Notifications REST API provides methods for managing devices for Push Notifications. Here are the descriptions of a full representation of each of the Push Notifications resources available.</description>
</info>
Expand Down
8 changes: 4 additions & 4 deletions war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.exoplatform.addons.push-notifications</groupId>
<artifactId>exo-push-notifications</artifactId>
<groupId>io.meeds.push-notifications</groupId>
<artifactId>push-notifications</artifactId>
<version>7.0.x-SNAPSHOT</version>
</parent>
<artifactId>exo-push-notifications-webapp</artifactId>
<artifactId>push-notifications-webapp</artifactId>

<packaging>war</packaging>
<name>eXo Push notifications addon - Webapp</name>
<name>Meeds:: Push notifications addon - Webapp</name>
<dependencies>

</dependencies>
Expand Down
Loading