Repository: deltaspike Updated Branches: refs/heads/master 2c5c9d203 -> a51278e59
DELTASPIKE-1194 Fix binary assembly to pull in dependencies declared. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a51278e5 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a51278e5 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a51278e5 Branch: refs/heads/master Commit: a51278e59334f4155e36a565b858275430022786 Parents: 2c5c9d2 Author: John D. Ament <[email protected]> Authored: Wed Aug 17 20:50:12 2016 -0400 Committer: John D. Ament <[email protected]> Committed: Wed Aug 17 20:50:12 2016 -0400 ---------------------------------------------------------------------- deltaspike/dist/full/pom.xml | 195 ++++++++++++++++++- .../full/src/main/distribution/assembly.xml | 3 + 2 files changed, 194 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a51278e5/deltaspike/dist/full/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/dist/full/pom.xml b/deltaspike/dist/full/pom.xml index 9a4cc65..7158f42 100644 --- a/deltaspike/dist/full/pom.xml +++ b/deltaspike/dist/full/pom.xml @@ -32,11 +32,198 @@ <name>Apache DeltaSpike Full Distribution</name> <dependencies> <dependency> - <groupId>org.apache.deltaspike.distribution</groupId> - <artifactId>distributions-bom</artifactId> + <groupId>org.apache.deltaspike.core</groupId> + <artifactId>deltaspike-core-api</artifactId> <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.core</groupId> + <artifactId>deltaspike-core-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-security-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-security-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-jpa-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-jpa-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-servlet-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-servlet-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-jsf-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-jsf-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-jsf-module-impl-ee6</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-data-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-data-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Dependencies for Java-SE --> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-owb</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-openejb</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-servlet</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-partial-bean-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-partial-bean-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-test-control-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-test-control-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-bean-validation-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-bean-validation-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-scheduler-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-scheduler-module-impl</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-proxy-module-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.deltaspike.modules</groupId> + <artifactId>deltaspike-proxy-module-impl-asm5</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a51278e5/deltaspike/dist/full/src/main/distribution/assembly.xml ---------------------------------------------------------------------- diff --git a/deltaspike/dist/full/src/main/distribution/assembly.xml b/deltaspike/dist/full/src/main/distribution/assembly.xml index 7751bb1..fa43ca9 100644 --- a/deltaspike/dist/full/src/main/distribution/assembly.xml +++ b/deltaspike/dist/full/src/main/distribution/assembly.xml @@ -41,18 +41,21 @@ <includes> <include>org.apache.deltaspike.modules:*</include> </includes> + <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping> <outputDirectory>modules</outputDirectory> </dependencySet> <dependencySet> <includes> <include>org.apache.deltaspike.core:*</include> </includes> + <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping> <outputDirectory>core</outputDirectory> </dependencySet> <dependencySet> <includes> <include>org.apache.deltaspike.cdictrl:*</include> </includes> + <outputFileNameMapping>${artifact.artifactId}-${project.version}.${artifact.extension}</outputFileNameMapping> <outputDirectory>cdictrl</outputDirectory> </dependencySet> </dependencySets>
