You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2017/05/28 10:37:53 UTC
[2/2] deltaspike git commit: clean up superfluous stuff in our poms
clean up superfluous stuff in our poms
yet another dependencyManagement where a ${deltaspike.version} would have been enough...
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a62a93fc
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a62a93fc
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a62a93fc
Branch: refs/heads/master
Commit: a62a93fca4b9664f523077ce86fa25b9dc41915d
Parents: 3ab179f
Author: Mark Struberg <st...@apache.org>
Authored: Sun May 28 11:11:48 2017 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun May 28 11:37:34 2017 +0200
----------------------------------------------------------------------
deltaspike/cdictrl/pom.xml | 18 +---
deltaspike/dist/pom.xml | 198 ----------------------------------------
deltaspike/parent/pom.xml | 14 +++
3 files changed, 17 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/cdictrl/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index bb9287d..157d53d 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -36,9 +36,6 @@
<profiles>
<profile>
<id>OWB</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<modules>
<module>api</module>
@@ -93,19 +90,10 @@
</profile>
<profile>
- <id>apache-release</id>
-
- <modules>
- <module>api</module>
- <module>impl-owb</module>
- <module>impl-weld</module>
- <module>impl-openejb</module>
- <module>servlet</module>
- <module>tck</module>
- </modules>
- </profile>
- <profile>
<id>distribution</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<modules>
<module>api</module>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/dist/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/dist/pom.xml b/deltaspike/dist/pom.xml
index 1ca37eb..88e6f8f 100644
--- a/deltaspike/dist/pom.xml
+++ b/deltaspike/dist/pom.xml
@@ -34,204 +34,6 @@
<name>Apache DeltaSpike Distribution</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-api</artifactId>
- <version>${project.version}</version>
- <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>
- </dependencyManagement>
<modules>
<module>bom</module>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index f6eea00..f6fd3d5 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -632,6 +632,20 @@
<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>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-weld</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
Re: [2/2] deltaspike git commit: clean up superfluous stuff in our poms
Posted by "John D. Ament" <jo...@apache.org>.
This is actually pretty import to keep, all of the dependencies in the dist
pom. Without these with the explicit scope of compile, the remaining
targets won't work correctly.
On Sun, May 28, 2017 at 6:37 AM <st...@apache.org> wrote:
> clean up superfluous stuff in our poms
>
> yet another dependencyManagement where a ${deltaspike.version} would have
> been enough...
>
>
> Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
> Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a62a93fc
> Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a62a93fc
> Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a62a93fc
>
> Branch: refs/heads/master
> Commit: a62a93fca4b9664f523077ce86fa25b9dc41915d
> Parents: 3ab179f
> Author: Mark Struberg <st...@apache.org>
> Authored: Sun May 28 11:11:48 2017 +0200
> Committer: Mark Struberg <st...@apache.org>
> Committed: Sun May 28 11:37:34 2017 +0200
>
> ----------------------------------------------------------------------
> deltaspike/cdictrl/pom.xml | 18 +---
> deltaspike/dist/pom.xml | 198 ----------------------------------------
> deltaspike/parent/pom.xml | 14 +++
> 3 files changed, 17 insertions(+), 213 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/cdictrl/pom.xml
> ----------------------------------------------------------------------
> diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
> index bb9287d..157d53d 100644
> --- a/deltaspike/cdictrl/pom.xml
> +++ b/deltaspike/cdictrl/pom.xml
> @@ -36,9 +36,6 @@
> <profiles>
> <profile>
> <id>OWB</id>
> - <activation>
> - <activeByDefault>true</activeByDefault>
> - </activation>
>
> <modules>
> <module>api</module>
> @@ -93,19 +90,10 @@
> </profile>
>
> <profile>
> - <id>apache-release</id>
> -
> - <modules>
> - <module>api</module>
> - <module>impl-owb</module>
> - <module>impl-weld</module>
> - <module>impl-openejb</module>
> - <module>servlet</module>
> - <module>tck</module>
> - </modules>
> - </profile>
> - <profile>
> <id>distribution</id>
> + <activation>
> + <activeByDefault>true</activeByDefault>
> + </activation>
>
> <modules>
> <module>api</module>
>
>
> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/dist/pom.xml
> ----------------------------------------------------------------------
> diff --git a/deltaspike/dist/pom.xml b/deltaspike/dist/pom.xml
> index 1ca37eb..88e6f8f 100644
> --- a/deltaspike/dist/pom.xml
> +++ b/deltaspike/dist/pom.xml
> @@ -34,204 +34,6 @@
>
> <name>Apache DeltaSpike Distribution</name>
>
> - <dependencyManagement>
> - <dependencies>
> - <dependency>
> - <groupId>org.apache.deltaspike.core</groupId>
> - <artifactId>deltaspike-core-api</artifactId>
> - <version>${project.version}</version>
> - <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>
> - </dependencyManagement>
>
> <modules>
> <module>bom</module>
>
>
> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a62a93fc/deltaspike/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
> index f6eea00..f6fd3d5 100644
> --- a/deltaspike/parent/pom.xml
> +++ b/deltaspike/parent/pom.xml
> @@ -632,6 +632,20 @@
>
> <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>
> + <scope>runtime</scope>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.deltaspike.cdictrl</groupId>
> <artifactId>deltaspike-cdictrl-weld</artifactId>
> <version>${project.version}</version>
> <scope>runtime</scope>
>
>