Skip to content

ARIES-2177: Stop using aries application in samples #636

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

Merged
alien11689 merged 5 commits into from
Apr 18, 2025
Merged

ARIES-2177: Stop using aries application in samples #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4c3c8e
ARIES-2177: Remove twitter sample as purely focus only on installing …
alien11689 Apr 18, 2025
38b0060
ARIES-2177: Remove eba usage from samples/ariestrader
alien11689 Apr 18, 2025
0ba31fa
ARIES-2177: Remove eba usage from samples/blog
alien11689 Apr 18, 2025
ae62f17
ARIES-2177: Remove eba usage from samples/blueprint
alien11689 Apr 18, 2025
c6af909
ARIES-2177: Remove aries application usage in samples parent
alien11689 Apr 18, 2025
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
90 changes: 0 additions & 90 deletions samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml
View file
Open in desktop

This file was deleted.

63 changes: 23 additions & 40 deletions samples/ariestrader/assemblies/equinox-test-harness/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
<version>1.0.1-SNAPSHOT</version>
</parent>

<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>equinox-test-harness</artifactId>
<name>Equinox test harness that can be used to install sample EBAs</name>
<name>Equinox test harness that can be used to install sample</name>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -190,66 +189,50 @@
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.wrappers</artifactId>
</dependency>

<!--
Aries Trader Dependencies
-->
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.install</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.management</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.runtime</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.derby.ds</artifactId>
</dependency>

<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.utils</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.modeller</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.deployment.management</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.default.local.platform</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.web</artifactId>
</dependency>

<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.obr</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.beans</artifactId>
</dependency>

<dependency>
<groupId>org.apache.aries.application</groupId>
<artifactId>org.apache.aries.application.resolver.noop</artifactId>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.persist.jdbc</artifactId>
</dependency>

<!--
Aries Trader Dependencies
-->
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.derby.ds</artifactId>
<artifactId>org.apache.aries.samples.ariestrader.entities</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.all</artifactId>
<type>eba</type>
<artifactId>org.apache.aries.samples.ariestrader.persist.jpa.am</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
<type>eba</type>
<artifactId>org.apache.aries.samples.ariestrader.persist.jpa.cm</artifactId>
</dependency>
</dependencies>

Expand Down
19 changes: 9 additions & 10 deletions ...ader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ pax-web-extender-war-${pax-web.version}.jar@start,\
pax-web-jsp-${pax-web.version}.jar@start,\
org.apache.felix.fileinstall-${org.apache.felix.fileinstall.version}.jar@start,\
org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar@start,\
org.apache.aries.application.install-${org.apache.aries.application.install.version}.jar@start,\
org.apache.aries.application.management-${org.apache.aries.application.management.version}.jar@start,\
org.apache.aries.application.api-${org.apache.aries.application.api.version}.jar@start,\
org.apache.aries.application.utils-${org.apache.aries.application.utils.version}.jar@start,\
org.apache.aries.application.runtime-${org.apache.aries.application.runtime.version}.jar@start,\
org.apache.aries.application.deployment.management-${org.apache.aries.application.deployment.management.version}.jar@start,\
org.apache.aries.application.modeller-${org.apache.aries.application.modeller.version}.jar@start,\
org.apache.aries.application.resolver.obr-${org.apache.aries.application.resolver.obr.version}.jar@start,\
org.apache.aries.application.resolver.noop-${org.apache.aries.application.resolver.noop.version}.jar@start,\
org.apache.aries.application.default.local.platform-${org.apache.aries.application.default.local.platform.version}.jar@start,\
org.apache.aries.jndi-${org.apache.aries.jndi.version}.jar@start,\
org.apache.aries.jpa.api-${org.apache.aries.jpa.api.version}.jar@start,\
org.apache.aries.jpa.blueprint.aries-${org.apache.aries.jpa.blueprint.aries.version}.jar@start,\
Expand All @@ -62,6 +52,15 @@ org.apache.aries.transaction.blueprint-${org.apache.aries.transaction.blueprint.
org.apache.aries.transaction.manager-${org.apache.aries.transaction.manager.version}.jar@start,\
org.apache.aries.transaction.wrappers-${org.apache.aries.transaction.wrappers.version}.jar@start,\
org.apache.aries.samples.ariestrader.derby.ds-${project.version}.jar@start
org.apache.aries.samples.ariestrader.util-${project.version}.jar@start
org.apache.aries.samples.ariestrader.core-${project.version}.jar@start
org.apache.aries.samples.ariestrader.api-${project.version}.jar@start
org.apache.aries.samples.ariestrader.web-${project.version}.jar@start
org.apache.aries.samples.ariestrader.beans-${project.version}.jar@start
org.apache.aries.samples.ariestrader.entities-${project.version}.jar@start
org.apache.aries.samples.ariestrader.persist.jdbc-${project.version}.jar@start
org.apache.aries.samples.ariestrader.persist.jpa.am-${project.version}.jar@start
org.apache.aries.samples.ariestrader.persist.jpa.cm-${project.version}.jar@start
eclipse.ignoreApp=true
org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG
org.osgi.framework.system.packages=\
Expand Down
16 changes: 0 additions & 16 deletions samples/ariestrader/assemblies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<version>1.0.1-SNAPSHOT</version>
</parent>

<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>assemblies</artifactId>
<name>AriesTrader :: Assemblies</name>
<packaging>pom</packaging>
Expand All @@ -39,25 +38,10 @@
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.all</artifactId>
<version>${project.version}</version>
<type>eba</type>
</dependency>
<dependency>
<groupId>org.apache.aries.samples.ariestrader</groupId>
<artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId>
<version>${project.version}</version>
<type>eba</type>
</dependency>
</dependencies>
</dependencyManagement>

<modules>
<module>ariestrader-jdbc-eba</module>
<module>ariestrader-all-eba</module>
<module>equinox-test-harness</module>
</modules>

Expand Down
Loading