You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/01/25 10:00:51 UTC
svn commit: r1726592 - in /maven/plugins/trunk/maven-ejb-plugin: ./
src/it/default/ src/it/exclude-ejb-jar-xml/ src/it/manifest-content/
src/it/mejb-34-filtered/ src/it/mejb-34-not-filtered/ src/it/mejb-93/
src/it/reactor/ src/it/reactor/sub/ src/it/se...
Author: khmarbaise
Date: Mon Jan 25 09:00:51 2016
New Revision: 1726592
URL: http://svn.apache.org/viewvc?rev=1726592&view=rev
Log:
[MEJB-94] Make integration tests more reliable
Added:
maven/plugins/trunk/maven-ejb-plugin/src/it/setup/
maven/plugins/trunk/maven-ejb-plugin/src/it/setup/invoker.properties
maven/plugins/trunk/maven-ejb-plugin/src/it/setup/pom.xml
Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/default/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/exclude-ejb-jar-xml/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-filtered/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-not-filtered/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-93/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml
Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Mon Jan 25 09:00:51 2016
@@ -152,6 +152,9 @@ under the License.
<debug>true</debug>
<projectsDirectory>src/it</projectsDirectory>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <setupIncludes>
+ <setupInclude>setup/pom.xml</setupInclude>
+ </setupIncludes>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/default/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/default/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/default/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/default/pom.xml Mon Jan 25 09:00:51 2016
@@ -22,6 +22,12 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
+
<groupId>org.apache.maven.its.ejb.default</groupId>
<artifactId>maven-it-it0017</artifactId>
<version>1.0</version>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/exclude-ejb-jar-xml/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/exclude-ejb-jar-xml/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/exclude-ejb-jar-xml/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/exclude-ejb-jar-xml/pom.xml Mon Jan 25 09:00:51 2016
@@ -22,6 +22,12 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
+
<groupId>org.apache.maven.its.ejb.eejx</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/manifest-content/pom.xml Mon Jan 25 09:00:51 2016
@@ -22,6 +22,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>org.apache.maven.its.ejb.mc</groupId>
<artifactId>test</artifactId>
<version>1.0</version>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-filtered/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-filtered/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-filtered/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-filtered/pom.xml Mon Jan 25 09:00:51 2016
@@ -21,6 +21,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>org.apache.maven.its.ejb</groupId>
<artifactId>mejb-34-filtered</artifactId>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-not-filtered/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-not-filtered/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-not-filtered/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-34-not-filtered/pom.xml Mon Jan 25 09:00:51 2016
@@ -21,6 +21,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>org.apache.maven.its.ejb</groupId>
<artifactId>mejb-34-not-filtered</artifactId>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-93/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-93/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-93/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/mejb-93/pom.xml Mon Jan 25 09:00:51 2016
@@ -21,6 +21,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>org.apache.maven.its.ejb.default</groupId>
<artifactId>maven-it-mejb93</artifactId>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/pom.xml Mon Jan 25 09:00:51 2016
@@ -21,6 +21,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
<groupId>org.apache.maven.its.ejb.reactor</groupId>
<artifactId>aggregator</artifactId>
Modified: maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml?rev=1726592&r1=1726591&r2=1726592&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/reactor/sub/pom.xml Mon Jan 25 09:00:51 2016
@@ -22,6 +22,12 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+ </parent>
+
<groupId>org.apache.maven.its.ejb.reactor</groupId>
<artifactId>sub</artifactId>
<version>1.0</version>
Added: maven/plugins/trunk/maven-ejb-plugin/src/it/setup/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/setup/invoker.properties?rev=1726592&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/setup/invoker.properties (added)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/setup/invoker.properties Mon Jan 25 09:00:51 2016
@@ -0,0 +1,18 @@
+# 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.
+invoker.name = Setup EJB Integration Test Parent
+invoker.goals = install
Added: maven/plugins/trunk/maven-ejb-plugin/src/it/setup/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/it/setup/pom.xml?rev=1726592&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/it/setup/pom.xml (added)
+++ maven/plugins/trunk/maven-ejb-plugin/src/it/setup/pom.xml Mon Jan 25 09:00:51 2016
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.ejb</groupId>
+ <artifactId>maven-ejb-it-setup</artifactId>
+ <version>1.0</version>
+
+ <packaging>pom</packaging>
+
+ <name>EJB IT Setup</name>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>