This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 735af9d68 ARIES-2177: Drop eba-maven-plugin
735af9d68 is described below
commit 735af9d686c17cb7816ed2e41008ff8924191c04
Author: Dominik Przybysz <[email protected]>
AuthorDate: Sun Apr 20 20:58:53 2025 +0200
ARIES-2177: Drop eba-maven-plugin
---
.github/labeler.yml | 3 -
.github/workflows/eba-maven-plugin.yml | 48 --
README.md | 2 +-
eba-maven-plugin/LICENSE | 203 --------
eba-maven-plugin/NOTICE | 8 -
eba-maven-plugin/pom.xml | 165 -------
.../java/org/apache/aries/plugin/eba/EbaMojo.java | 537 ---------------------
.../main/resources/META-INF/plexus/components.xml | 51 --
.../org/apache/aries/plugin/eba/EbaMojoTest.java | 446 -----------------
.../aries/plugin/eba/stubs/EbaArtifactStub.java | 113 -----
.../plugin/eba/stubs/EbaMavenProjectStub.java | 158 ------
.../plugin/eba/stubs/EbaMavenProjectStub2.java | 31 --
.../plugin/eba/stubs/EbaMavenProjectStub3.java | 31 --
.../plugin/eba/stubs/EbaMavenProjectStub4.java | 31 --
.../plugin/eba/stubs/EbaMavenProjectStub5.java | 31 --
.../plugin/eba/stubs/EbaMavenProjectStub6.java | 31 --
.../plugin/eba/stubs/EbaMavenProjectStub7.java | 31 --
.../1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.jar | Bin 360 -> 0 bytes
.../1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom | 25 -
.../1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.jar | Bin 360 -> 0 bytes
.../1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom | 36 --
.../1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.jar | Bin 360 -> 0 bytes
.../1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.pom | 25 -
.../unit/basic-eba-all-bundles/plugin-config.xml | 38 --
.../plugin-config.xml | 38 --
.../unit/basic-eba-no-bundles/plugin-config.xml | 38 --
.../unit/basic-eba-test/plugin-config.xml | 41 --
.../unit/basic-eba-test/target/test-eba.jar | 1 -
.../basic-eba-with-descriptor/plugin-config.xml | 41 --
.../src/main/eba/META-INF/APPLICATION.MF | 12 -
.../unit/basic-eba-with-manifest/plugin-config.xml | 41 --
.../src/main/eba/META-INF/APPLICATION.MF | 12 -
.../src/main/eba/META-INF/MANIFEST.MF | 12 -
.../basic-eba-without-manifest/plugin-config.xml | 45 --
pom.xml | 1 -
35 files changed, 1 insertion(+), 2325 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 8b0646c80..ceddb0108 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -10,9 +10,6 @@ blueprint:
blueprint-maven-plugin:
- changed-files:
- any-glob-to-any-file: 'blueprint-maven-plugin/**/*'
-eba-maven-plugin:
-- changed-files:
- - any-glob-to-any-file: 'eba-maven-plugin/**/*'
esa-ant-task:
- changed-files:
- any-glob-to-any-file: 'esa-ant-task/**/*'
diff --git a/.github/workflows/eba-maven-plugin.yml
b/.github/workflows/eba-maven-plugin.yml
deleted file mode 100644
index 4b0a29ba8..000000000
--- a/.github/workflows/eba-maven-plugin.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Licensed 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.
-
-name: eba-maven-plugin - CI Build
-
-on:
- pull_request:
- paths:
- - parent/**
- - eba-maven-plugin/**
- - .github/workflows/eba-maven-plugin.yml
- push:
- branches:
- - 'trunk'
-
-env:
- LC_ALL: en_US.UTF-8
-
-jobs:
- JDKxx_Matrix:
- timeout-minutes: 10
- strategy:
- fail-fast: false
- matrix:
- java: [ 8 ]
- os: [ ubuntu-latest ]
- name: JDK${{ matrix.java }} ${{ matrix.os }}
- runs-on: ${{ matrix.os }}
- steps:
- - name: Git Checkout
- uses: actions/checkout@v4
- - name: Set up Java
- uses: actions/setup-java@v4
- with:
- distribution: 'temurin'
- java-version: ${{ matrix.java }}
- - name: Build eba-maven-plugin
- shell: bash
- run: mvn -U -e -B -ntp clean install -f eba-maven-plugin -P run-its
diff --git a/README.md b/README.md
index f34db64e3..71d113227 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ See [Apache Aries Website](http://aries.apache.org/).
- [](https://github.com/apache/aries/actions/workflows/application.yml)
- the implementation is using `org.osgi.service.framework` from Eclipse
Equinox that is [available only in versions
3.5..3.7](https://bugs.eclipse.org/bugs/show_bug.cgi?id=345790)
- [](https://github.com/apache/aries/actions/workflows/async.yml)
- [](https://github.com/apache/aries/actions/workflows/blueprint.yml)
-- [](https://github.com/apache/aries/actions/workflows/eba-maven-plugin.yml)
+- eba-maven-plugin was moves to the attic and can be found under
[`eba-maven-plugin-goes-to-the-attic`
tag](https://github.com/apache/aries/tree/eba-maven-plugin-goes-to-the-attic/eba-maven-plugin)
- EJB was moved to the attic and can be found under [`ejb-goes-to-the-attic`
tag](https://github.com/apache/aries/tree/ejb-goes-to-the-attic/ejb)
- [](https://github.com/apache/aries/actions/workflows/esa-ant-task.yml)
- [](https://github.com/apache/aries/actions/workflows/esa-maven-plugin.yml)
diff --git a/eba-maven-plugin/LICENSE b/eba-maven-plugin/LICENSE
deleted file mode 100644
index 6b0b1270f..000000000
--- a/eba-maven-plugin/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/eba-maven-plugin/NOTICE b/eba-maven-plugin/NOTICE
deleted file mode 100644
index a15bc51da..000000000
--- a/eba-maven-plugin/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache Aries
-Copyright 2009-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/eba-maven-plugin/pom.xml b/eba-maven-plugin/pom.xml
deleted file mode 100644
index 691297264..000000000
--- a/eba-maven-plugin/pom.xml
+++ /dev/null
@@ -1,165 +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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>eba-maven-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>Aries Maven EBA Plugin</name>
- <description>Builds an eba (Enterprise Bundle Archive) from the project
for deployment to an aries server.
- </description>
-
- <scm>
-
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
-
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
- </scm>
-
- <properties>
- <biz.aQute.bndlib.version>6.4.1</biz.aQute.bndlib.version>
- <maven.version>3.9.9</maven.version>
- <maven-archiver.version>3.6.3</maven-archiver.version>
- <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
- <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version>
-
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
- <plexus-archiver.version>4.10.0</plexus-archiver.version>
-
<plexus-container-default.version>2.1.1</plexus-container-default.version>
- <plexus-utils.version>4.0.2</plexus-utils.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>${biz.aQute.bndlib.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
- <version>${maven-archiver.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-archiver</artifactId>
- <version>${plexus-archiver.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexus-utils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>${maven-plugin-testing-harness.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>${plexus-container-default.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>run-its</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${maven-invoker-plugin.version}</version>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <goals>
- <goal>clean</goal>
- <goal>package</goal>
- </goals>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git
a/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
b/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
deleted file mode 100644
index a0e110601..000000000
--- a/eba-maven-plugin/src/main/java/org/apache/aries/plugin/eba/EbaMojo.java
+++ /dev/null
@@ -1,537 +0,0 @@
-package org.apache.aries.plugin.eba;
-
-/*
- * 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.
- */
-
-import org.apache.maven.archiver.PomPropertiesUtil;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.archiver.ArchiverException;
-import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.FileUtils;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.apache.maven.shared.osgi.Maven2OsgiConverter;
-import aQute.bnd.osgi.Analyzer;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Builds Aries Enterprise Bundle Archive (eba) files.
- *
- * @version $Id: $
- * @goal eba
- * @phase package
- * @requiresDependencyResolution test
- */
-public class EbaMojo extends AbstractMojo {
-
-
- public static final String APPLICATION_MF_URI =
"META-INF/APPLICATION.MF";
-
- private static final String[] DEFAULT_INCLUDES = {"**/**"};
-
- /**
- * Application manifest headers
- */
- private static final String MANIFEST_VERSION = "Manifest-Version";
- private static final String APPLICATION_MANIFESTVERSION =
"Application-ManifestVersion";
- private static final String APPLICATION_SYMBOLICNAME =
"Application-SymbolicName";
- private static final String APPLICATION_VERSION = "Application-Version";
- private static final String APPLICATION_NAME = "Application-Name";
- private static final String APPLICATION_DESCRIPTION =
"Application-Description";
- private static final String APPLICATION_CONTENT = "Application-Content";
- private static final String APPLICATION_EXPORTSERVICE =
"Application-ExportService";
- private static final String APPLICATION_IMPORTSERVICE =
"Application-ImportService";
- private static final String APPLICATION_USEBUNDLE = "Use-Bundle";
-
- /**
- * Coverter for maven pom values to OSGi manifest values (pulled in from
the maven-bundle-plugin)
- */
- private Maven2OsgiConverter maven2OsgiConverter = new
DefaultMaven2OsgiConverter();
-
- /**
- * Single directory for extra files to include in the eba.
- *
- * @parameter expression="${basedir}/src/main/eba"
- * @required
- */
- private File ebaSourceDirectory;
-
- /**
- * The location of the APPLICATION.MF file to be used within the eba file.
- *
- * @parameter expression="${basedir}/src/main/eba/META-INF/APPLICATION.MF"
- */
- private File applicationManifestFile;
-
- /**
- * Specify if the generated jar file of this project should be
- * included in the eba file ; default is true.
- *
- * @parameter
- */
- private Boolean includeJar = Boolean.TRUE;
-
- /**
- * The location of the manifest file to be used within the eba file.
- *
- * @parameter expression="${basedir}/src/main/eba/META-INF/MANIFEST.MF"
- */
- private File manifestFile;
-
- /**
- * Directory that resources are copied to during the build.
- *
- * @parameter
expression="${project.build.directory}/${project.build.finalName}"
- * @required
- */
- private String workDirectory;
-
- /**
- * Directory that remote-resources puts legal files.
- *
- * @parameter
expression="${project.build.directory}/maven-shared-archive-resources"
- * @required
- */
- private String sharedResources;
-
- /**
- * The directory for the generated eba.
- *
- * @parameter expression="${project.build.directory}"
- * @required
- */
- private String outputDirectory;
-
- /**
- * The name of the eba file to generate.
- *
- * @parameter alias="ebaName" expression="${project.build.finalName}"
- * @required
- */
- private String finalName;
-
- /**
- * The maven project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- /**
- * The Jar archiver.
- *
- * @component role="org.codehaus.plexus.archiver.Archiver" roleHint="zip"
- * @required
- */
- private ZipArchiver zipArchiver;
-
- /**
- * Whether to generate a manifest based on maven configuration.
- *
- * @parameter expression="${generateManifest}" default-value="false"
- */
- private boolean generateManifest;
-
- /**
- * Configuration for the plugin.
- *
- * @parameter
- */
- private Map<?,?> instructions = new LinkedHashMap<>();
-
- /**
- * Adding pom.xml and pom.properties to the archive.
- *
- * @parameter expression="${addMavenDescriptor}" default-value="true"
- */
- private boolean addMavenDescriptor;
-
- /**
- * Include or not empty directories
- *
- * @parameter expression="${includeEmptyDirs}" default-value="true"
- */
- private boolean includeEmptyDirs;
-
- /**
- * Whether creating the archive should be forced.
- *
- * @parameter expression="${forceCreation}" default-value="false"
- */
- private boolean forceCreation;
-
- /**
- * Whether to follow transitive dependencies or use explicit dependencies.
- *
- * @parameter expression="${useTransitiveDependencies}"
default-value="false"
- */
- private boolean useTransitiveDependencies;
-
- /**
- * Define which bundles to include in the archive.
- * none - no bundles are included
- * applicationContent - direct dependencies go into the content
- * all - direct and transitive dependencies go into the content
- *
- * @parameter expression="${archiveContent}"
default-value="applicationContent"
- */
- private String archiveContent;
-
-
- private File buildDir;
-
-
- public void execute()
- throws MojoExecutionException
- {
- getLog().debug( " ======= EbaMojo settings =======" );
- getLog().debug( "ebaSourceDirectory[" + ebaSourceDirectory + "]" );
- getLog().debug( "manifestFile[" + manifestFile + "]" );
- getLog().debug( "applicationManifestFile[" + applicationManifestFile +
"]" );
- getLog().debug( "workDirectory[" + workDirectory + "]" );
- getLog().debug( "outputDirectory[" + outputDirectory + "]" );
- getLog().debug( "finalName[" + finalName + "]" );
- getLog().debug( "generateManifest[" + generateManifest + "]" );
-
- if (archiveContent == null) {
- archiveContent = new String("applicationContent");
- }
-
- getLog().debug( "archiveContent[" + archiveContent + "]" );
- getLog().info( "archiveContent[" + archiveContent + "]" );
-
- zipArchiver.setIncludeEmptyDirs( includeEmptyDirs );
- zipArchiver.setCompress( true );
- zipArchiver.setForced( forceCreation );
- // Check if jar file is there and if requested, copy it
- try
- {
- if (includeJar.booleanValue()) {
- File generatedJarFile = new File( outputDirectory, finalName +
".jar" );
- if (generatedJarFile.exists()) {
- getLog().info( "Including generated jar
file["+generatedJarFile.getName()+"]");
- zipArchiver.addFile(generatedJarFile, finalName + ".jar");
- }
- }
- }
- catch ( ArchiverException e )
- {
- throw new MojoExecutionException( "Error adding generated Jar
file", e );
-
- }
-
- // Copy dependencies
- try
- {
- Set<Artifact> artifacts = null;
- if (useTransitiveDependencies || "all".equals(archiveContent)) {
- // if use transitive is set (i.e. true) then we need to make
sure archiveContent does not contradict (i.e. is set
- // to the same compatible value or is the default).
- if ("none".equals(archiveContent)) {
- throw new
MojoExecutionException("<useTransitiveDependencies/> and <archiveContent/>
incompatibly configured. <useTransitiveDependencies/> is deprecated in favor
of <archiveContent/>." );
- }
- else {
- artifacts = project.getArtifacts();
- }
- } else {
- // check that archiveContent is compatible
- if ("applicationContent".equals(archiveContent)) {
- artifacts = project.getDependencyArtifacts();
- }
- else {
- // the only remaining options should be
applicationContent="none"
- getLog().info("archiveContent=none: application arvhive
will not contain any bundles.");
- }
- }
- if (artifacts != null) {
- for (Artifact artifact : artifacts) {
-
- ScopeArtifactFilter filter = new
ScopeArtifactFilter(Artifact.SCOPE_RUNTIME);
- if (!artifact.isOptional() && filter.include(artifact)) {
- getLog().info("Copying artifact[" +
artifact.getGroupId() + ", " + artifact.getId() + ", " +
- artifact.getScope() + "]");
- zipArchiver.addFile(artifact.getFile(),
artifact.getArtifactId() + "-" + artifact.getVersion() + "." +
(artifact.getType() == null ? "jar" : artifact.getType()));
- }
- }
- }
- }
- catch ( ArchiverException e )
- {
- throw new MojoExecutionException( "Error copying EBA
dependencies", e );
- }
-
- // Copy source files
- try
- {
- File ebaSourceDir = ebaSourceDirectory;
- if ( ebaSourceDir.exists() )
- {
- getLog().info( "Copy eba resources to " +
getBuildDir().getAbsolutePath() );
-
- DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( ebaSourceDir.getAbsolutePath() );
- scanner.setIncludes( DEFAULT_INCLUDES );
- scanner.addDefaultExcludes();
- scanner.scan();
-
- String[] dirs = scanner.getIncludedDirectories();
-
- for ( int j = 0; j < dirs.length; j++ )
- {
- new File( getBuildDir(), dirs[j] ).mkdirs();
- }
-
- String[] files = scanner.getIncludedFiles();
-
- for ( int j = 0; j < files.length; j++ )
- {
- File targetFile = new File( getBuildDir(), files[j] );
-
- targetFile.getParentFile().mkdirs();
-
- File file = new File( ebaSourceDir, files[j] );
- FileUtils.copyFileToDirectory( file,
targetFile.getParentFile() );
- }
- }
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Error copying EBA resources", e
);
- }
-
- // Include custom manifest if necessary
- try
- {
- if (!generateManifest) {
- includeCustomApplicationManifestFile();
- }
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( "Error copying APPLICATION.MF
file", e );
- }
-
- // Generate application manifest if requested
- if (generateManifest) {
- String fileName = new String(getBuildDir() + "/"
- + APPLICATION_MF_URI);
- File appMfFile = new File(fileName);
-
- try {
- // Delete any old manifest
- if (appMfFile.exists()) {
- FileUtils.fileDelete(fileName);
- }
-
- appMfFile.getParentFile().mkdirs();
- if (appMfFile.createNewFile()) {
- writeApplicationManifest(fileName);
- }
- } catch (java.io.IOException e) {
- throw new MojoExecutionException(
- "Error generating
APPLICATION.MF file: " + fileName, e);
- }
- }
-
- // Check if connector deployment descriptor is there
- File ddFile = new File( getBuildDir(), APPLICATION_MF_URI);
- if ( !ddFile.exists() )
- {
- getLog().warn(
- "Application manifest: " + ddFile.getAbsolutePath() + " does
not exist." );
- }
-
- try
- {
- if (addMavenDescriptor) {
- if (project.getArtifact().isSnapshot()) {
- project.setVersion(project.getArtifact().getVersion());
- }
-
- String groupId = project.getGroupId();
-
- String artifactId = project.getArtifactId();
-
- zipArchiver.addFile(project.getFile(), "META-INF/maven/" +
groupId + "/" + artifactId + "/pom.xml");
- PomPropertiesUtil pomPropertiesUtil = new PomPropertiesUtil();
- File dir = new File(project.getBuild().getDirectory(),
"maven-zip-plugin");
- File pomPropertiesFile = new File(dir, "pom.properties");
- pomPropertiesUtil.createPomProperties(project, zipArchiver,
null, pomPropertiesFile, forceCreation);
- }
- File ebaFile = new File( outputDirectory, finalName + ".eba" );
- zipArchiver.setDestFile(ebaFile);
-
- File buildDir = getBuildDir();
- if (buildDir.isDirectory()) {
- zipArchiver.addDirectory(buildDir);
- }
- //include legal files if any
- File sharedResourcesDir = new File(sharedResources);
- if (sharedResourcesDir.isDirectory()) {
- zipArchiver.addDirectory(sharedResourcesDir);
- }
- zipArchiver.createArchive();
-
- project.getArtifact().setFile( ebaFile );
- }
- catch ( Exception e )
- {
- throw new MojoExecutionException( "Error assembling eba", e );
- }
- }
-
- private void writeApplicationManifest(String fileName)
- throws MojoExecutionException {
- try {
- // TODO: add support for dependency version ranges.
Need to pick
- // them up from the pom and convert them to OSGi
version ranges.
- FileUtils.fileAppend(fileName, MANIFEST_VERSION + ": "
+ "1" + "\n");
- FileUtils.fileAppend(fileName,
APPLICATION_MANIFESTVERSION + ": " + "1" + "\n");
- FileUtils.fileAppend(fileName, APPLICATION_SYMBOLICNAME
+ ": "
- +
getApplicationSymbolicName(project.getArtifact()) + "\n");
- FileUtils.fileAppend(fileName, APPLICATION_VERSION + ":
"
- + getApplicationVersion() + "\n");
- FileUtils.fileAppend(fileName, APPLICATION_NAME + ": "
+ project.getName() + "\n");
- FileUtils.fileAppend(fileName, APPLICATION_DESCRIPTION
+ ": "
- + project.getDescription() + "\n");
-
- // Write the APPLICATION-CONTENT
- // TODO: check that the dependencies are bundles
(currently, the converter
- // will throw an exception)
- Set<Artifact> artifacts;
- if (useTransitiveDependencies) {
- artifacts = project.getArtifacts();
- } else {
- artifacts = project.getDependencyArtifacts();
- }
- artifacts = selectArtifacts(artifacts);
- Iterator<Artifact> iter = artifacts.iterator();
-
- FileUtils.fileAppend(fileName, APPLICATION_CONTENT + ":
");
- if (iter.hasNext()) {
- Artifact artifact = iter.next();
- FileUtils.fileAppend(fileName,
maven2OsgiConverter
- .getBundleSymbolicName(artifact)
- + ";version=\""
- +
Analyzer.cleanupVersion(artifact.getVersion())
-// +
maven2OsgiConverter.getVersion(artifact.getVersion())
- + "\"");
- }
- while (iter.hasNext()) {
- Artifact artifact = iter.next();
- FileUtils.fileAppend(fileName, ",\n "
- +
maven2OsgiConverter.getBundleSymbolicName(artifact)
- + ";version=\""
- +
Analyzer.cleanupVersion(artifact.getVersion())
-// +
maven2OsgiConverter.getVersion(artifact.getVersion())
- + "\"");
- }
-
- FileUtils.fileAppend(fileName, "\n");
-
- // Add any service imports or exports
- if
(instructions.containsKey(APPLICATION_EXPORTSERVICE)) {
- FileUtils.fileAppend(fileName,
APPLICATION_EXPORTSERVICE + ": "
- +
instructions.get(APPLICATION_EXPORTSERVICE) + "\n");
- }
- if
(instructions.containsKey(APPLICATION_IMPORTSERVICE)) {
- FileUtils.fileAppend(fileName,
APPLICATION_IMPORTSERVICE + ": "
- +
instructions.get(APPLICATION_IMPORTSERVICE) + "\n");
- }
- if (instructions.containsKey(APPLICATION_USEBUNDLE)) {
- FileUtils.fileAppend(fileName,
APPLICATION_USEBUNDLE + ": "
- +
instructions.get(APPLICATION_USEBUNDLE) + "\n");
- }
- // Add any use bundle entry
-
- } catch (Exception e) {
- throw new MojoExecutionException(
- "Error writing dependencies into
APPLICATION.MF", e);
- }
-
- }
-
- // The maven2OsgiConverter assumes the artifact is a jar so we need our own
- // This uses the same fallback scheme as the converter
- private String getApplicationSymbolicName(Artifact artifact) {
- if (instructions.containsKey(APPLICATION_SYMBOLICNAME)) {
- return
instructions.get(APPLICATION_SYMBOLICNAME).toString();
- }
- return artifact.getGroupId() + "." + artifact.getArtifactId();
- }
-
- private String getApplicationVersion() {
- if (instructions.containsKey(APPLICATION_VERSION)) {
- return instructions.get(APPLICATION_VERSION).toString();
- }
- return Analyzer.cleanupVersion(project.getVersion());
- }
-
- protected File getBuildDir()
- {
- if ( buildDir == null )
- {
- buildDir = new File( workDirectory );
- }
- return buildDir;
- }
-
- private void includeCustomApplicationManifestFile()
- throws IOException
- {
- if (applicationManifestFile == null) {
- throw new NullPointerException("Application manifest file location
not set. Use <generateManifest>true</generateManifest> if you want it to be
generated.");
- }
- File appMfFile = applicationManifestFile;
- if (appMfFile.exists()) {
- getLog().info( "Using APPLICATION.MF "+ applicationManifestFile);
- File metaInfDir = new File(getBuildDir(), "META-INF");
- FileUtils.copyFileToDirectory( appMfFile, metaInfDir);
- }
- }
-
- /**
- * Return artifacts in 'compile' or 'runtime' scope only.
- */
- private Set<Artifact> selectArtifacts(Set<Artifact> artifacts)
- {
- Set<Artifact> selected = new LinkedHashSet<>();
- for (Artifact artifact : artifacts) {
- String scope = artifact.getScope();
- if (scope == null
- || Artifact.SCOPE_COMPILE.equals(scope)
- || Artifact.SCOPE_RUNTIME.equals(scope)) {
- selected.add(artifact);
- }
- }
- return selected;
- }
-}
diff --git a/eba-maven-plugin/src/main/resources/META-INF/plexus/components.xml
b/eba-maven-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index dc60a8a56..000000000
--- a/eba-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,51 +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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>eba</role-hint>
-
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
- <configuration>
- <lifecycles>
- <lifecycle>
- <id>default</id>
- <phases>
-
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <process-test-resources>
-
org.apache.maven.plugins:maven-resources-plugin:testResources
- </process-test-resources>
-
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-
<package>org.apache.aries:eba-maven-plugin:eba</package>
-
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
-
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
- </phases>
- </lifecycle>
- </lifecycles>
- </configuration>
- </component>
- </components>
-</component-set>
-
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java
deleted file mode 100644
index 39f149e90..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/EbaMojoTest.java
+++ /dev/null
@@ -1,446 +0,0 @@
-package org.apache.aries.plugin.eba;
-
-/*
- * 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.
- */
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
-/**
- * @author <a href="mailto:[email protected]";>Allan Ramirez</a>
- */
-public class EbaMojoTest
- extends AbstractMojoTestCase
-{
- public void testEbaTestEnvironment()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-test/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
- }
-
- public void testBasicEba()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-test/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- Boolean includeJar = ( Boolean ) getVariableValueFromObject( mojo,
"includeJar" );
-
- assertTrue( includeJar.booleanValue() );
-
- //include the project jar to the eba
- File projectJar = new File( getBasedir(),
"src/test/resources/unit/basic-eba-test/target/test-eba.jar" );
-
- FileUtils.copyFileToDirectory( projectJar, new File( outputDir ) );
-
- mojo.execute();
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
-// expectedFiles.add( "META-INF/MANIFEST.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "test-eba.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
- }
-
- public void testBasicEbaWithDescriptor()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-with-descriptor/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
-// expectedFiles.add( "META-INF/MANIFEST.MF" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
- }
-
- public void testBasicEbaWithManifest()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-with-manifest/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
- expectedFiles.add( "META-INF/MANIFEST.MF" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
- }
-
- public void testApplicationManifestGeneration()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-without-manifest/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
-
- //Test Application-ImportService Application-ExportService and
Use-Bundle inclusion
- ZipEntry entry = eba.getEntry("META-INF/APPLICATION.MF");
- BufferedReader br = new BufferedReader(new
InputStreamReader(eba.getInputStream(entry)));
-
- String appServiceExport = new String("Application-ExportService:
test.ExportService");
- String appServiceImport = new String("Application-ImportService:
test.ImportService");
- String useBundle = new String("Use-Bundle:
org.apache.aries.test.Bundle;version=1.0.0-SNAPSHOT");
- Boolean foundAppExport=false;
- Boolean foundAppImport=false;
- Boolean foundUseBundle=false;
-
- String line;
- while ((line = br.readLine()) != null) {
- if (line.contains(new String("Application-ExportService"))) {
- assertEquals(appServiceExport, line);
- foundAppExport = true;
- }
- if (line.contains(new String("Application-ImportService"))) {
- assertEquals(appServiceImport, line);
- foundAppImport = true;
- }
- if (line.contains(new String("Use-Bundle"))) {
- assertEquals(useBundle, line);
- foundUseBundle = true;
- }
- }
- assertTrue("Found Application-ExportService:", foundAppExport);
- assertTrue("Found Application-ImportService:", foundAppImport);
- assertTrue("Found Use-Bundle:", foundUseBundle);
- }
-
-
- public void testArchiveContentConfigurationNoBundles()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-no-bundles/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
-
- }
-
- public void testArchiveContentConfigurationApplicationContentBundles()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-content-bundles-only/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
-
- }
-
- public void testArchiveContentConfigurationAllBundles()
- throws Exception
- {
- File testPom = new File( getBasedir(),
-
"target/test-classes/unit/basic-eba-all-bundles/plugin-config.xml" );
-
- EbaMojo mojo = ( EbaMojo ) lookupMojo( "eba", testPom );
-
- assertNotNull( mojo );
-
- String finalName = ( String ) getVariableValueFromObject( mojo,
"finalName" );
-
- String workDir = ( String ) getVariableValueFromObject( mojo,
"workDirectory" );
-
- String outputDir = ( String ) getVariableValueFromObject( mojo,
"outputDirectory" );
-
- mojo.execute();
-
-
- //check the generated eba file
- File ebaFile = new File( outputDir, finalName + ".eba" );
-
- assertTrue( ebaFile.exists() );
-
- //expected files/directories inside the eba file
- List expectedFiles = new ArrayList();
-
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.properties" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/pom.xml" );
- expectedFiles.add(
"META-INF/maven/org.apache.maven.test/maven-eba-test/" );
- expectedFiles.add( "META-INF/maven/org.apache.maven.test/" );
- expectedFiles.add( "META-INF/maven/" );
- expectedFiles.add( "META-INF/APPLICATION.MF" );
- expectedFiles.add( "META-INF/" );
- expectedFiles.add( "maven-artifact01-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact02-1.0-SNAPSHOT.jar" );
- expectedFiles.add( "maven-artifact03-1.0-SNAPSHOT.jar" );
-
- ZipFile eba = new ZipFile( ebaFile );
-
- Enumeration entries = eba.entries();
-
- assertTrue( entries.hasMoreElements() );
-
- int missing = getSizeOfExpectedFiles(entries, expectedFiles);
- assertEquals("Missing files: " + expectedFiles, 0, missing);
-
- }
-
- private int getSizeOfExpectedFiles( Enumeration entries, List
expectedFiles )
- {
- while( entries.hasMoreElements() )
- {
- ZipEntry entry = ( ZipEntry ) entries.nextElement();
-
- if( expectedFiles.contains( entry.getName() ) )
- {
- expectedFiles.remove( entry.getName() );
- assertFalse( expectedFiles.contains( entry.getName() ) );
- }
- else
- {
- fail( entry.getName() + " is not included in the expected
files" );
- }
- }
- return expectedFiles.size();
- }
-
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaArtifactStub.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaArtifactStub.java
deleted file mode 100644
index 1b9f6fb2b..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaArtifactStub.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-
-/**
- * @author <a href="mailto:[email protected]";>Allan Ramirez</a>
- */
-public class EbaArtifactStub
- extends ArtifactStub
-{
- private String groupId;
-
- private String artifactId;
-
- private String version;
-
- private String scope;
-
- private boolean optional;
-
- private File file;
-
- public String getArtifactId()
- {
- return artifactId;
- }
-
- public void setArtifactId( String artifactId )
- {
- this.artifactId = artifactId;
- }
-
- public File getFile()
- {
- return file;
- }
-
- public void setFile( File file )
- {
- this.file = file;
- }
-
- public String getGroupId()
- {
- return groupId;
- }
-
- public void setGroupId( String groupId )
- {
- this.groupId = groupId;
- }
-
- public boolean isOptional()
- {
- return optional;
- }
-
- public void setOptional( boolean optional )
- {
- this.optional = optional;
- }
-
- public String getScope()
- {
- return scope;
- }
-
- public void setScope( String scope )
- {
- this.scope = scope;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion( String version )
- {
- this.version = version;
- }
-
- public String getId()
- {
- return getGroupId() + ":" + getArtifactId() + ":" + getVersion();
- }
-
- public String getBaseVersion()
- {
- return getVersion();
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
deleted file mode 100644
index a95e99085..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Organization;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.PlexusTestCase;
-
-/**
- * @author <a href="mailto:[email protected]";>Allan Ramirez</a>
- */
-public class EbaMavenProjectStub
- extends MavenProject
-{
- private List attachedArtifacts;
-
- public EbaMavenProjectStub()
- {
- super( new Model() );
-
- super.setGroupId( getGroupId() );
- super.setArtifactId( getArtifactId() );
- super.setVersion( getVersion() );
- super.setDescription( "Test description" );
-
- Organization org = new Organization();
- org.setName( "organization" );
- org.setUrl( "http://www.some.org"; );
-
- super.setOrganization( org );
- super.setFile( getFile() );
- super.setPluginArtifacts( Collections.EMPTY_SET );
- super.setReportArtifacts( Collections.EMPTY_SET );
- super.setExtensionArtifacts( Collections.EMPTY_SET );
- super.setArtifact( getArtifact() );
- super.setRemoteArtifactRepositories( Collections.EMPTY_LIST );
- super.setPluginArtifactRepositories( Collections.EMPTY_LIST );
- super.setCollectedProjects( Collections.EMPTY_LIST );
- super.setActiveProfiles( Collections.EMPTY_LIST );
-
- super.addCompileSourceRoot( getBasedir() +
"/src/test/resources/unit/basic-eba-test/src/main/java" );
- super.addTestCompileSourceRoot( getBasedir() +
"/src/test/resources/unit/basic-eba-test/src/test/java" );
-
- super.setExecutionRoot( false );
- }
-
- public String getGroupId()
- {
- return "org.apache.maven.test";
- }
-
- public String getArtifactId()
- {
- return "maven-eba-test";
- }
-
- public String getVersion()
- {
- return "1.0-SNAPSHOT";
- }
-
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-test/plugin-config.xml" );
- }
-
- public File getBasedir()
- {
- return new File( PlexusTestCase.getBasedir() );
- }
-
- public Artifact getArtifact()
- {
- Artifact artifact = new EbaArtifactStub();
-
- artifact.setGroupId( getGroupId() );
-
- artifact.setArtifactId( getArtifactId() );
-
- artifact.setVersion( getVersion() );
-
- return artifact;
- }
-
- public Set getArtifacts()
- {
- Set artifacts = getDependencyArtifacts();
-
- // this one's a transitive dependency
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact03", "1.0-SNAPSHOT", false ) );
-
- return artifacts;
- }
-
- @Override
- public Set getDependencyArtifacts() {
- Set artifacts = new HashSet();
-
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact01", "1.0-SNAPSHOT", false ) );
- artifacts.add( createArtifact( "org.apache.maven.test",
"maven-artifact02", "1.0-SNAPSHOT", false ) );
-
- return artifacts;
- }
-
- public List getAttachedArtifacts()
- {
- if ( attachedArtifacts == null )
- {
- attachedArtifacts = new ArrayList();
- }
- return attachedArtifacts;
- }
-
- protected Artifact createArtifact( String groupId, String artifactId,
String version, boolean optional )
- {
- Artifact artifact = new EbaArtifactStub();
-
- artifact.setGroupId( groupId );
-
- artifact.setArtifactId( artifactId );
-
- artifact.setVersion( version );
-
- artifact.setOptional( optional );
-
- artifact.setFile( new File ( getBasedir() + "/src/test/remote-repo/" +
artifact.getGroupId().replace( '.', '/' ) +
- "/" + artifact.getArtifactId() + "/" +
artifact.getVersion() +
- "/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + ".jar" ) ) ;
-
- return artifact;
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub2.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub2.java
deleted file mode 100644
index c0159d494..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub2.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub2
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub3.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub3.java
deleted file mode 100644
index f189c9ff1..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub3.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub3
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub4.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub4.java
deleted file mode 100644
index 5230dc3ed..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub4.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub4
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-without-manifest/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub5.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub5.java
deleted file mode 100644
index e735f5dd5..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub5.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub5
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-no-bundles/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub6.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub6.java
deleted file mode 100644
index 74f63b41f..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub6.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub6
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-content-bundles-only/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub7.java
b/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub7.java
deleted file mode 100644
index dbb026cf0..000000000
---
a/eba-maven-plugin/src/test/java/org/apache/aries/plugin/eba/stubs/EbaMavenProjectStub7.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.aries.plugin.eba.stubs;
-
-/*
- * 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.
- */
-
-import java.io.File;
-
-public class EbaMavenProjectStub7
- extends EbaMavenProjectStub
-{
- public File getFile()
- {
- return new File( getBasedir(),
"src/test/resources/unit/basic-eba-all-bundles/plugin-config.xml" );
- }
-}
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.jar
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.jar
deleted file mode 100644
index 68e9bc57e..000000000
Binary files
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.jar
and /dev/null differ
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom
deleted file mode 100644
index 1d3585b68..000000000
---
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact01/1.0-SNAPSHOT/maven-artifact01-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,25 +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>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>maven-artifact01</artifactId>
- <version>1.0-SNAPSHOT</version>
-</project>
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.jar
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.jar
deleted file mode 100644
index 89309642c..000000000
Binary files
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.jar
and /dev/null differ
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom
deleted file mode 100644
index b4e7e937e..000000000
---
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact02/1.0-SNAPSHOT/maven-artifact02-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,36 +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>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>maven-artifact02</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <!-- define a transitive dependency on artifact03 -->
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>maven-artifact03</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-
-</project>
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.jar
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.jar
deleted file mode 100644
index 89309642c..000000000
Binary files
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.jar
and /dev/null differ
diff --git
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.pom
b/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.pom
deleted file mode 100644
index b1dc9bb91..000000000
---
a/eba-maven-plugin/src/test/remote-repo/org/apache/maven/test/maven-artifact03/1.0-SNAPSHOT/maven-artifact03-1.0-SNAPSHOT.pom
+++ /dev/null
@@ -1,25 +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>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.test</groupId>
- <artifactId>maven-artifact03</artifactId>
- <version>1.0-SNAPSHOT</version>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-all-bundles/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-all-bundles/plugin-config.xml
deleted file mode 100644
index 7e3c386f0..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-all-bundles/plugin-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- 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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-all-bundles/src/main/eba</ebaSourceDirectory>
-
<generateManifest>true</generateManifest>
- <archiveContent>all</archiveContent>
- <instructions>
- </instructions>
- <includeJar>false</includeJar>
-
<addMavenDescriptor>true</addMavenDescriptor>
-
<includeEmptyDirs>true</includeEmptyDirs>
-
<workDirectory>${basedir}/target/unit/basic-eba-all-bundles/target/eba-test-all-bundles
- </workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-all-bundles/target/maven-shared-archive-resources
- </sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-all-bundles/target
- </outputDirectory>
-
<finalName>test-eba-all-bundles</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub7" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-content-bundles-only/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-content-bundles-only/plugin-config.xml
deleted file mode 100644
index 209077f55..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-content-bundles-only/plugin-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- 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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-content-bundles-only/src/main/eba</ebaSourceDirectory>
-
<generateManifest>true</generateManifest>
-
<archiveContent>applicationContent</archiveContent>
- <instructions>
- </instructions>
- <includeJar>false</includeJar>
-
<addMavenDescriptor>true</addMavenDescriptor>
-
<includeEmptyDirs>true</includeEmptyDirs>
-
<workDirectory>${basedir}/target/unit/basic-eba-content-bundles-only/target/eba-test-content-bundles-only
- </workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-content-bundles-only/target/maven-shared-archive-resources
- </sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-content-bundles-only/target
- </outputDirectory>
-
<finalName>test-eba-content-bundles-only</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub6" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-no-bundles/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-no-bundles/plugin-config.xml
deleted file mode 100644
index 525b25830..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-no-bundles/plugin-config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- 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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-no-bundles/src/main/eba</ebaSourceDirectory>
-
<generateManifest>true</generateManifest>
- <archiveContent>none</archiveContent>
- <instructions>
- </instructions>
- <includeJar>false</includeJar>
-
<addMavenDescriptor>true</addMavenDescriptor>
-
<includeEmptyDirs>true</includeEmptyDirs>
-
<workDirectory>${basedir}/target/unit/basic-eba-no-bundles/target/eba-test-no-bundles
- </workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-no-bundles/target/maven-shared-archive-resources
- </sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-no-bundles/target
- </outputDirectory>
-
<finalName>test-eba-no-bundles</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub5" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
deleted file mode 100644
index a6832346a..000000000
--- a/eba-maven-plugin/src/test/resources/unit/basic-eba-test/plugin-config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-test/src/main/eba</ebaSourceDirectory>
-
<applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-test/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
- <includeJar>true</includeJar>
- <addMavenDescriptor>true</addMavenDescriptor>
- <includeEmptyDirs>true</includeEmptyDirs>
-
<manifestFile>${basedir}/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
-
<workDirectory>${basedir}/target/unit/basic-eba-test/target/eba-test</workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-test/target/maven-shared-archive-resources</sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-test/target</outputDirectory>
- <finalName>test-eba</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-test/target/test-eba.jar
b/eba-maven-plugin/src/test/resources/unit/basic-eba-test/target/test-eba.jar
deleted file mode 100644
index 6f5f2f812..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-test/target/test-eba.jar
+++ /dev/null
@@ -1 +0,0 @@
-This is not an actual jar
\ No newline at end of file
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
deleted file mode 100644
index e02fa2cc0..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/plugin-config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba</ebaSourceDirectory>
-
<applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
- <includeJar>false</includeJar>
- <addMavenDescriptor>true</addMavenDescriptor>
- <includeEmptyDirs>true</includeEmptyDirs>
-
<manifestFile>${basedir}/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
-
<workDirectory>${basedir}/target/unit/basic-eba-with-descriptor/target/eba-test-with-descriptor</workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-with-descriptor/target/maven-shared-archive-resources</sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-with-descriptor/target</outputDirectory>
- <finalName>test-eba-with-descriptor</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub2" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/APPLICATION.MF
b/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/APPLICATION.MF
deleted file mode 100644
index 808008dd4..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-descriptor/src/main/eba/META-INF/APPLICATION.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Application-ManifestVersion: 1.0
-Application-Name: Bank Account
-Application-SymbolicName: com.mybank.account.app
-Application-Version: 1.0
-Application-Content:
- com.mybank.account.bankWeb; version=1.0.0,
- com.mybank.account.bankAccount; version=1.0.0,
- com.mybank.account.common; version=1.0.0,
- com.mybank.account.utility; version=1.0.0
-Application-ExportService: com.mybank.account.service.AccountService
-Application-ImportService:
com.mybank.security.UserAuthService;filter="(security=strong)"
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
deleted file mode 100644
index 9a43959e9..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/plugin-config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba</ebaSourceDirectory>
-
<applicationManifestFile>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/APPLICATION.MF</applicationManifestFile>
- <includeJar>false</includeJar>
- <addMavenDescriptor>true</addMavenDescriptor>
- <includeEmptyDirs>true</includeEmptyDirs>
-
<manifestFile>${basedir}/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/MANIFEST.MF</manifestFile>
-
<workDirectory>${basedir}/target/unit/basic-eba-with-manifest/target/eba-test-with-manifest</workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-with-manifest/target/maven-shared-archive-resources</sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-with-manifest/target</outputDirectory>
- <finalName>test-eba-with-manifest</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub3" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/APPLICATION.MF
b/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/APPLICATION.MF
deleted file mode 100644
index 808008dd4..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/APPLICATION.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Application-ManifestVersion: 1.0
-Application-Name: Bank Account
-Application-SymbolicName: com.mybank.account.app
-Application-Version: 1.0
-Application-Content:
- com.mybank.account.bankWeb; version=1.0.0,
- com.mybank.account.bankAccount; version=1.0.0,
- com.mybank.account.common; version=1.0.0,
- com.mybank.account.utility; version=1.0.0
-Application-ExportService: com.mybank.account.service.AccountService
-Application-ImportService:
com.mybank.security.UserAuthService;filter="(security=strong)"
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/MANIFEST.MF
b/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d64d29ab..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-with-manifest/src/main/eba/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: test
-Archiver-Version: test
-Created-By: Apache Maven
-Built-By: aqr
-Build-Jdk: 1.4.2_11
-Extension-Name: maven-rar-test
-Specification-Title: Test description
-Specification-Vendor: organization
-Implementation-Vendor: organization
-Implementation-Title: maven-rar-test
-Implementation-Version: 1.0-SNAPSHOT
-
diff --git
a/eba-maven-plugin/src/test/resources/unit/basic-eba-without-manifest/plugin-config.xml
b/eba-maven-plugin/src/test/resources/unit/basic-eba-without-manifest/plugin-config.xml
deleted file mode 100644
index 914d7d786..000000000
---
a/eba-maven-plugin/src/test/resources/unit/basic-eba-without-manifest/plugin-config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-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>
- <build>
- <plugins>
- <plugin>
- <artifactId>eba-maven-plugin</artifactId>
- <configuration>
-
<ebaSourceDirectory>${basedir}/src/test/resources/unit/basic-eba-without-manifest/src/main/eba</ebaSourceDirectory>
- <generateManifest>true</generateManifest>
- <instructions>
-
<Application-ExportService>test.ExportService</Application-ExportService>
-
<Application-ImportService>test.ImportService</Application-ImportService>
-
<Use-Bundle>org.apache.aries.test.Bundle;version=1.0.0-SNAPSHOT</Use-Bundle>
- </instructions>
- <includeJar>false</includeJar>
- <addMavenDescriptor>true</addMavenDescriptor>
- <includeEmptyDirs>true</includeEmptyDirs>
-
<workDirectory>${basedir}/target/unit/basic-eba-without-manifest/target/eba-test-without-manifest</workDirectory>
-
<sharedResources>${basedir}/target/unit/basic-eba-without-manifest/target/maven-shared-archive-resources</sharedResources>
-
<outputDirectory>${basedir}/target/unit/basic-eba-without-manifest/target</outputDirectory>
- <finalName>test-eba-without-manifest</finalName>
- <project
implementation="org.apache.aries.plugin.eba.stubs.EbaMavenProjectStub4" />
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 3bb5ad6af..aeb30f81f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
<module>async</module>
<module>blueprint</module>
<module>blueprint-maven-plugin</module>
- <module>eba-maven-plugin</module>
<module>esa-ant-task</module>
<module>esa-maven-plugin</module>
<module>jmx</module>
