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

Merge Mip 69 #399

Closed
wants to merge 2 commits into from
Closed

Merge Mip 69 #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e06ee9b
TASK-62301: Create FB mips and update projects versions/dependencies
aycherif Feb 16, 2023
8e1990c
feat: Exclude bcprov-jdk15on from wallet packaging - EXO-59676 - Meed…
hakermi Jul 26, 2023
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
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<artifactId>addons-parent-pom</artifactId>
<groupId>org.exoplatform.addons</groupId>
<version>17-M04</version>
<version>17-mips-SNAPSHOT</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<version>17-mips-SNAPSHOT</version>
<version>17-M04</version>

<relativePath/>
</parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<version>2.5.x-mips-SNAPSHOT</version>
<version>2.5.x-SNAPSHOT</version>

<packaging>pom</packaging>
<name>eXo Add-on:: Wallet Add-on</name>
<description>eXo Wallet Add-on</description>
Expand All @@ -46,10 +46,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</scm>
<properties>
<!-- 3rd party libraries versions -->
<org.exoplatform.social.version>6.5.x-SNAPSHOT</org.exoplatform.social.version>
<org.exoplatform.social.version>6.5.x-mips-SNAPSHOT</org.exoplatform.social.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<org.exoplatform.social.version>6.5.x-mips-SNAPSHOT</org.exoplatform.social.version>
<org.exoplatform.social.version>6.5.x-SNAPSHOT</org.exoplatform.social.version>

<org.exoplatform.wallet.ert-contract.version>1.3.0</org.exoplatform.wallet.ert-contract.version>
<org.exoplatform.platform-ui.version>6.5.x-SNAPSHOT</org.exoplatform.platform-ui.version>
<addon.exo.analytics.version>1.4.x-SNAPSHOT</addon.exo.analytics.version>
<org.exoplatform.platform-ui.version>6.5.x-mips-SNAPSHOT</org.exoplatform.platform-ui.version>
<addon.exo.analytics.version>1.4.x-mips-SNAPSHOT</addon.exo.analytics.version>
Comment on lines +51 to +52
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<org.exoplatform.platform-ui.version>6.5.x-mips-SNAPSHOT</org.exoplatform.platform-ui.version>
<addon.exo.analytics.version>1.4.x-mips-SNAPSHOT</addon.exo.analytics.version>
<org.exoplatform.platform-ui.version>6.5.x-SNAPSHOT</org.exoplatform.platform-ui.version>
<addon.exo.analytics.version>1.4.x-SNAPSHOT</addon.exo.analytics.version>

<!-- Sonar properties -->
<sonar.organization>meeds-io</sonar.organization>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion wallet-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
</parent>
<artifactId>wallet-api</artifactId>
<name>eXo Add-on:: Wallet - API</name>
Expand Down
2 changes: 1 addition & 1 deletion wallet-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
</parent>
<artifactId>wallet-packaging</artifactId>
<packaging>pom</packaging>
Expand Down
3 changes: 3 additions & 0 deletions wallet-packaging/src/main/assemblies/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<includes>
<include>*:*:jar</include>
</includes>
<excludes>
<exclude>org.bouncycastle:bcprov-jdk15on:jar</exclude>
</excludes>
<scope>compile</scope>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
Expand Down
2 changes: 1 addition & 1 deletion wallet-reward-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
</parent>
<artifactId>wallet-reward-services</artifactId>
<name>eXo Add-on:: Wallet - Reward Services</name>
Expand Down
2 changes: 1 addition & 1 deletion wallet-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
</parent>
<artifactId>wallet-services</artifactId>
<name>eXo Add-on:: Wallet - Services</name>
Expand Down
2 changes: 1 addition & 1 deletion wallet-webapps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<parent>
<groupId>org.exoplatform.addons.wallet</groupId>
<artifactId>wallet</artifactId>
<version>2.5.x-SNAPSHOT</version>
<version>2.5.x-mips-SNAPSHOT</version>
</parent>
<artifactId>wallet-webapps</artifactId>
<packaging>war</packaging>
Expand Down