You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ma...@apache.org on 2016/09/22 08:13:14 UTC
deltaspike git commit: DELTASPIKE-1024 correction for Wildfly managed
profiles.
Repository: deltaspike
Updated Branches:
refs/heads/master 573c1c88d -> 3fed4bfb9
DELTASPIKE-1024 correction for Wildfly managed profiles.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3fed4bfb
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3fed4bfb
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3fed4bfb
Branch: refs/heads/master
Commit: 3fed4bfb910abf3e58b8e12fd6cead76aaddad9a
Parents: 573c1c8
Author: Matej Novotny <ma...@apache.org>
Authored: Thu Sep 22 10:09:01 2016 +0200
Committer: Matej Novotny <ma...@apache.org>
Committed: Thu Sep 22 10:09:01 2016 +0200
----------------------------------------------------------------------
deltaspike/cdictrl/impl-weld/pom.xml | 159 +++++++++++++++++++++---------
deltaspike/parent/code/pom.xml | 26 +++--
2 files changed, 131 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3fed4bfb/deltaspike/cdictrl/impl-weld/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/pom.xml b/deltaspike/cdictrl/impl-weld/pom.xml
index 88d417c..9191475 100644
--- a/deltaspike/cdictrl/impl-weld/pom.xml
+++ b/deltaspike/cdictrl/impl-weld/pom.xml
@@ -1,22 +1,22 @@
<?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.
- -->
+<!--
+~ Licensed to the Apache Software Foundation (ASF) under one
+~ or more contributor license agreements. See the NOTICE file
+~ distributed with this work for additional information
+~ regarding copyright ownership. The ASF licenses this file
+~ to you under the Apache License, Version 2.0 (the
+~ "License"); you may not use this file except in compliance
+~ with the License. You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied. See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -64,32 +64,101 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <!--Following profiles add TCK tests for CDICTRL when running with Weld1/2/3 profiles-->
+ <!--This eliminated the tests when running on Wildfly container as it makes no sense there-->
+ <profiles>
+ <profile>
+ <id>Weld1</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.deltaspike.test</groupId>
+ <artifactId>deltaspike-cdictrl-tck</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>Weld2</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.deltaspike.test</groupId>
+ <artifactId>deltaspike-cdictrl-tck</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.deltaspike.test</groupId>
- <artifactId>deltaspike-cdictrl-tck</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profile>
+ <id>Weld3</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.deltaspike.test</groupId>
+ <artifactId>deltaspike-cdictrl-tck</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3fed4bfb/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 6c16960..90fd063 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -1054,24 +1054,28 @@
<profile>
<!--
- * WildFly has to be locally installed and must be started
+ * WildFly has to be locally installed
*
* JBOSS_HOME must be set for this to work correctly!
*
* Start the build with:
- * $> mvn clean install -Pwildfly-managed
+ * $> mvn clean install -Pwildfly-managed -Dweld.version=xxx
*
-->
<id>wildfly-managed</id>
<properties>
+ <!-- Actual default Weld version used with this profile -->
+ <weld.version>2.3.5.Final</weld.version>
<cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version>
</properties>
<dependencies>
+ <!--This brings in the cdi-api in correct version corresponding to Weld version specified with ${weld.version}-->
+ <!--Only for build purposes, for tests, Wildfly provides that-->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.1</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-impl</artifactId>
+ <version>${weld.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -1129,20 +1133,24 @@
* JBOSS_HOME need not be set for this.
*
* Start the build with:
- * $> mvn clean install -Pwildfly-build-managed
+ * $> mvn clean install -Pwildfly-build-managed -Dwildfly.version=10.0.0.Final -Dweld.version=xxx
*
-->
<id>wildfly-build-managed</id>
<properties>
+ <!-- Actual default Weld version used with this profile -->
+ <weld.version>2.3.5.Final</weld.version>
<cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version>
</properties>
<dependencies>
+ <!--This brings in the cdi-api in correct version corresponding to Weld version specified with ${weld.version}-->
+ <!--Only for build purposes, for tests, Wildfly provides that-->
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>1.1</version>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-impl</artifactId>
+ <version>${weld.version}</version>
<scope>provided</scope>
</dependency>
<dependency>