Skip to content
Snippets Groups Projects
Commit 067ab5bd authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-7683: xwiki-platform-tool-functional-test-lifecycle makes a pain to release platform

parent fae44be7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 154 deletions
xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
+ 17
− 12
View file @ 067ab5bd
......@@ -31,7 +31,9 @@
</parent>
<artifactId>xwiki-platform-index-test-tests</artifactId>
<name>XWiki Platform - Index - Tests - Functional Tests</name>
<packaging>functional-test</packaging>
<!-- TODO: Move to use "functional-test" in the future when http://jira.codehaus.org/browse/MNG-1911 is fixed,
see http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<packaging>jar</packaging>
<description>XWiki Platform - Index - Tests - Functional Tests</description>
<dependencies>
<!-- These XARs will be installed in the packaged XWiki for the test -->
......@@ -58,22 +60,25 @@
<build>
<testSourceDirectory>src/test/it</testSourceDirectory>
<plugins>
<!-- Even though the functional-test packaging ensures that the packager plugin will execute we still need to
redefine it here in order to make sure the right version is used as otherwise Maven will use the last
released version which may be the wrong one. -->
<!-- TODO: Remove when the following issue is fixed: http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<plugin>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-packager-plugin</artifactId>
<version>${project.version}</version>
<!-- Make sure that the pages are imported with the superadmin user that we use in our tests so that they have
programming rights. We need since since some Bot Listener use Groovy. -->
<configuration>
<importUser>superadmin</importUser>
</configuration>
<executions>
<execution>
<phase>generate-test-resources</phase>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<!-- Needed to add support for the "functional-test" packaging -->
<extension>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-functional-test-lifecycle</artifactId>
<version>${project.version}</version>
</extension>
</extensions>
</build>
</project>
xwiki-platform-core/xwiki-platform-ircbot/xwiki-platform-ircbot-test/xwiki-platform-ircbot-test-tests/pom.xml
+ 12
− 12
View file @ 067ab5bd
......@@ -31,7 +31,9 @@
</parent>
<artifactId>xwiki-platform-ircbot-test-tests</artifactId>
<name>XWiki Platform - IRC Bot - Tests - Functional Tests</name>
<packaging>functional-test</packaging>
<!-- TODO: Move to use "functional-test" in the future when http://jira.codehaus.org/browse/MNG-1911 is fixed,
see http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<packaging>jar</packaging>
<description>XWiki Platform - IRC Bot - Functional Tests</description>
<properties>
<!-- TODO: Remove once http://jira.xwiki.org/jira/browse/XWIKI-7581 is fixed -->
......@@ -85,9 +87,7 @@
<build>
<testSourceDirectory>src/test/it</testSourceDirectory>
<plugins>
<!-- Even though the functional-test packaging ensures that the packager plugin will execute we still need to
redefine it here in order to make sure the right version is used as otherwise Maven will use the last
released version which may be the wrong one. -->
<!-- TODO: Remove when the following issue is fixed: http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<plugin>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-packager-plugin</artifactId>
......@@ -97,15 +97,15 @@
<configuration>
<importUser>superadmin</importUser>
</configuration>
<executions>
<execution>
<phase>generate-test-resources</phase>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<!-- Needed to add support for the "functional-test" packaging -->
<extension>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-functional-test-lifecycle</artifactId>
<version>${project.version}</version>
</extension>
</extensions>
</build>
</project>
xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
+ 17
− 12
View file @ 067ab5bd
......@@ -31,7 +31,9 @@
</parent>
<artifactId>xwiki-platform-linkchecker-test-tests</artifactId>
<name>XWiki Platform - LinkChecker - Tests - Functional Tests</name>
<packaging>functional-test</packaging>
<!-- TODO: Move to use "functional-test" in the future when http://jira.codehaus.org/browse/MNG-1911 is fixed,
see http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<packaging>jar</packaging>
<description>XWiki Platform - LinkChecker - Tests - Functional Tests</description>
<properties>
<!-- Overridden configuration data for xwiki.properties to activate the Link Checker transformation -->
......@@ -74,22 +76,25 @@
<build>
<testSourceDirectory>src/test/it</testSourceDirectory>
<plugins>
<!-- Even though the functional-test packaging ensures that the packager plugin will execute we still need to
redefine it here in order to make sure the right version is used as otherwise Maven will use the last
released version which may be the wrong one. -->
<!-- TODO: Remove when the following issue is fixed: http://jira.xwiki.org/jira/browse/XWIKI-7683 -->
<plugin>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-packager-plugin</artifactId>
<version>${project.version}</version>
<!-- Make sure that the pages are imported with the superadmin user that we use in our tests so that they have
programming rights. We need since since some Bot Listener use Groovy. -->
<configuration>
<importUser>superadmin</importUser>
</configuration>
<executions>
<execution>
<phase>generate-test-resources</phase>
<goals>
<goal>package</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<extensions>
<!-- Needed to add support for the "functional-test" packaging -->
<extension>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tool-functional-test-lifecycle</artifactId>
<version>${project.version}</version>
</extension>
</extensions>
</build>
</project>
xwiki-platform-tools/pom.xml
+ 0
− 1
View file @ 067ab5bd
......@@ -35,7 +35,6 @@
<description>XWiki Platform - Tools - Parent POM</description>
<modules>
<module>xwiki-platform-tool-configuration-resources</module>
<module>xwiki-platform-tool-functional-test-lifecycle</module>
<module>xwiki-platform-tool-jetty-listener</module>
<module>xwiki-platform-tool-jetty-resources</module>
<module>xwiki-platform-tool-packager-plugin</module>
......
xwiki-platform-tools/xwiki-platform-tool-functional-test-lifecycle/pom.xml deleted 100644 → 0
+ 0
− 71
View file @ fae44be7
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*
-->
<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>
<parent>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-tools</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
<artifactId>xwiki-platform-tool-functional-test-lifecycle</artifactId>
<name>XWiki Platform - Tools - Functional Test Lifecycle</name>
<packaging>jar</packaging>
<description>Lifecycle for functional tests</description>
<properties>
<!-- Don't run CLIRR since we don't have java code in this module -->
<xwiki.clirr.skip>true</xwiki.clirr.skip>
</properties>
<profiles>
<!-- Override default check for javadoc JAR since this module doesn't contain any Java file and this doesn't
make the Maven Central Repository check fail (they must check for Java files in the main JAR before deciding
that the Javadoc JAR is missing or not). -->
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-javadoc-exists</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<evaluateBeanshell>
<condition>true</condition>
</evaluateBeanshell>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
xwiki-platform-tools/xwiki-platform-tool-functional-test-lifecycle/src/main/resources/META-INF/plexus/components.xml deleted 100644 → 0
+ 0
− 46
View file @ fae44be7
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*
-->
<component-set>
<components>
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>functional-test</role-hint>
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
<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>
<package>org.xwiki.platform:xwiki-platform-tool-packager-plugin:package</package>
<integration-test>org.apache.maven.plugins:maven-surefire-plugin:test</integration-test>
</phases>
</configuration>
</component>
</components>
</component-set>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment