This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2177-stop-using-aries-application-in-samples in repository https://gitbox.apache.org/repos/asf/aries.git
commit 38b00602dc8699d8154a416ff6d5690812935474 Author: Dominik Przybysz <[email protected]> AuthorDate: Fri Apr 18 22:50:14 2025 +0200 ARIES-2177: Remove eba usage from samples/ariestrader --- .../assemblies/ariestrader-all-eba/pom.xml | 90 ---------------------- .../assemblies/ariestrader-jdbc-eba/pom.xml | 77 ------------------ .../assemblies/equinox-test-harness/pom.xml | 63 ++++++--------- .../filtered-resources/configuration/config.ini | 19 +++-- samples/ariestrader/assemblies/pom.xml | 16 ---- 5 files changed, 32 insertions(+), 233 deletions(-) diff --git a/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml b/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml deleted file mode 100644 index 75303f79f..000000000 --- a/samples/ariestrader/assemblies/ariestrader-all-eba/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<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.apache.aries.samples.ariestrader</groupId> - <artifactId>assemblies</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.all</artifactId> - <packaging>eba</packaging> - <name>AriesTrader :: Assemblies - EBA - ALL</name> - <description>An EBA version of AriesTrader ALL</description> - <version>1.0.1-SNAPSHOT</version> - - <dependencies> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.web</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.beans</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.persist.jdbc</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.entities</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <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.persist.jpa.cm</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries</groupId> - <artifactId>eba-maven-plugin</artifactId> - <version>${eba-maven-plugin.version}</version> - <extensions>true</extensions> - <configuration> - <generateManifest>true</generateManifest> - <instructions> - <Application-SymbolicName>${project.artifactId}</Application-SymbolicName> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml b/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml deleted file mode 100644 index a1447ba77..000000000 --- a/samples/ariestrader/assemblies/ariestrader-jdbc-eba/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<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.apache.aries.samples.ariestrader</groupId> - <artifactId>assemblies</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.jdbc</artifactId> - <packaging>eba</packaging> - <name>AriesTrader :: Assemblies - EBA - JDBC</name> - <description>An EBA version of AriesTrader JDBC</description> - - <dependencies> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.util</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.beans</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.persist.jdbc</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.ariestrader</groupId> - <artifactId>org.apache.aries.samples.ariestrader.web</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries</groupId> - <artifactId>eba-maven-plugin</artifactId> - <version>${eba-maven-plugin.version}</version> - <extensions>true</extensions> - <configuration> - <generateManifest>true</generateManifest> - <instructions> - <Application-SymbolicName>${project.artifactId}</Application-SymbolicName> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml index 7223c9d0f..892be9952 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml +++ b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml @@ -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> @@ -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> diff --git a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini index d93b67980..e0d8cb86d 100644 --- a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini +++ b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini @@ -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,\ @@ -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=\ diff --git a/samples/ariestrader/assemblies/pom.xml b/samples/ariestrader/assemblies/pom.xml index c7d7e5231..7409abc6a 100644 --- a/samples/ariestrader/assemblies/pom.xml +++ b/samples/ariestrader/assemblies/pom.xml @@ -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> @@ -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>
