diff options
| -rw-r--r-- | all/pom.xml | 2 | ||||
| -rw-r--r-- | buildhelpers/pom.xml | 2 | ||||
| -rw-r--r-- | liferay/pom.xml | 236 | ||||
| -rw-r--r-- | pom.xml | 27 | ||||
| -rw-r--r-- | uitest/pom.xml | 609 |
5 files changed, 431 insertions, 445 deletions
diff --git a/all/pom.xml b/all/pom.xml index c234bb5147..fce46efd1f 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -172,7 +172,7 @@ <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <configuration> - <skipStaging>true</skipStaging> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> </configuration> </plugin> diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml index 904c2519ca..4dee81d1cb 100644 --- a/buildhelpers/pom.xml +++ b/buildhelpers/pom.xml @@ -74,7 +74,7 @@ <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <configuration> - <skipStaging>true</skipStaging> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> </configuration> </plugin> </plugins> diff --git a/liferay/pom.xml b/liferay/pom.xml index a5031f9045..df42599fda 100644 --- a/liferay/pom.xml +++ b/liferay/pom.xml @@ -1,140 +1,140 @@ <?xml version="1.0" encoding="UTF-8"?> <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-root</artifactId> - <version>7.7.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-liferay</artifactId> - <name>vaadin-liferay</name> - <packaging>pom</packaging> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-root</artifactId> + <version>7.7.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-liferay</artifactId> + <name>vaadin-liferay</name> + <packaging>pom</packaging> <url>https://vaadin.com/</url> - <description>Vaadin Liferay package</description> + <description>Vaadin Liferay package</description> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client-compiled</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-push</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-themes</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-themes</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-push</artifactId> - <includes>VAADIN/vaadinPush.js, VAADIN/vaadinPush.debug.js</includes> - </artifactItem> + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-push</artifactId> + <includes>VAADIN/vaadinPush.js, VAADIN/vaadinPush.debug.js</includes> + </artifactItem> - <artifactItem> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <includes>VAADIN/widgetsets/**/*</includes> - </artifactItem> + <artifactItem> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client-compiled</artifactId> + <includes>VAADIN/widgetsets/**/*</includes> + </artifactItem> - <artifactItem> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-themes</artifactId> - <includes> - VAADIN/themes/base/**, - VAADIN/themes/chameleon/**, - VAADIN/themes/liferay/**, - VAADIN/themes/runo/**, - VAADIN/themes/reindeer/** - </includes> - </artifactItem> - <artifactItem> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-server</artifactId> - <includes>VAADIN/vaadinBootstrap.js</includes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <archive> - <addMavenDescriptor>false</addMavenDescriptor> - </archive> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>liferay-assembly-descriptor.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - <pluginManagement> + <artifactItem> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-themes</artifactId> + <includes> + VAADIN/themes/base/**, + VAADIN/themes/chameleon/**, + VAADIN/themes/liferay/**, + VAADIN/themes/runo/**, + VAADIN/themes/reindeer/** + </includes> + </artifactItem> + <artifactItem> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-server</artifactId> + <includes>VAADIN/vaadinBootstrap.js</includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <archive> + <addMavenDescriptor>false</addMavenDescriptor> + </archive> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>liferay-assembly-descriptor.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + <pluginManagement> <plugins> <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <configuration> - <skipStaging>true</skipStaging> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> </configuration> </plugin> </plugins> - </pluginManagement> - </build> + </pluginManagement> + </build> </project> @@ -61,24 +61,23 @@ </organization> <url>https://vaadin.com/</url> <description>Vaadin Framework Root Pom</description> - <licenses> - <license> - <name>Apache License Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - <scm> - <connection>scm:https:https://github.com/vaadin/vaadin.git</connection> - <developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection> - <url>https://github.com/vaadin/vaadin</url> - </scm> + <licenses> + <license> + <name>Apache License Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + <scm> + <connection>scm:https:https://github.com/vaadin/vaadin.git</connection> + <developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection> + <url>https://github.com/vaadin/vaadin</url> + </scm> <modules> <module>all</module> <module>buildhelpers</module> - <module>bom</module> <module>shared</module> <module>push</module> <module>server</module> @@ -89,6 +88,8 @@ <module>widgets</module> <module>uitest</module> <module>liferay</module> + <!-- Nexus staging bug needs the last module to be deployed. --> + <module>bom</module> </modules> <build> diff --git a/uitest/pom.xml b/uitest/pom.xml index df10728bd0..6e25bbcf0e 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -1,343 +1,328 @@ <?xml version="1.0" encoding="UTF-8"?> <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-root</artifactId> - <version>7.7.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-uitest</artifactId> - <name>vaadin-uitest</name> - <packaging>pom</packaging> - <properties> - <jetty.version>8.1.12.v20130726</jetty.version> - </properties> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-root</artifactId> + <version>7.7.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-uitest</artifactId> + <name>vaadin-uitest</name> + <packaging>pom</packaging> + <properties> + <jetty.version>8.1.12.v20130726</jetty.version> + </properties> <url>https://vaadin.com/</url> - <description>Vaadin UI tests</description> + <description>Vaadin UI tests</description> - <repositories> - <repository> - <id>vaadin-addons</id> - <url>http://maven.vaadin.com/vaadin-addons</url> - </repository> - </repositories> - <dependencies> + <repositories> + <repository> + <id>vaadin-addons</id> + <url>http://maven.vaadin.com/vaadin-addons</url> + </repository> + </repositories> + <dependencies> - <!-- API DEPENDENCIES --> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - </dependency> + <!-- API DEPENDENCIES --> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.2.0.Final</version> - </dependency> - <!-- Google App Engine --> - <dependency> - <groupId>com.google.appengine</groupId> - <artifactId>appengine-api-1.0-sdk</artifactId> - <version>1.7.7</version> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.2.0.Final</version> + </dependency> + <!-- Google App Engine --> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <version>1.7.7</version> + </dependency> - <!-- LIBRARY DEPENDENCIES (compile time) --> - <!-- Project modules --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-themes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <!-- LIBRARY DEPENDENCIES (compile time) --> + <!-- Project modules --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client-compiled</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-themes</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-push</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> - <!-- For compiling TestingWidgetSet --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client-compiler</artifactId> - <version>${project.version}</version> - </dependency> + <!-- For compiling TestingWidgetSet --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client-compiler</artifactId> + <version>${project.version}</version> + </dependency> - <!-- Servlet 3.0 API --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-websocket</artifactId> - <version>${jetty.version}</version> + <!-- Servlet 3.0 API --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-websocket</artifactId> + <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>${jetty.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>orbit</artifactId> - </exclusion> - </exclusions> - </dependency> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${jetty.version}</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>orbit</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.52</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> - </dependency> - <!-- Mainly for SQLContainer tests --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>2.2.6</version> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-testbench</artifactId> - <version>4.0.3</version> - </dependency> - <!-- This should be removed once tests have been updated to use lang3 --> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.52</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons-io.version}</version> + </dependency> + <!-- Mainly for SQLContainer tests --> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.2.6</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-testbench</artifactId> + <version>4.0.3</version> + </dependency> + <!-- This should be removed once tests have been updated to use lang3 --> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> - </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + <version>${vaadin.sass.version}</version> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-buildhelpers</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>3.5.1.201410131835-r</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-buildhelpers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>3.5.1.201410131835-r</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>result</directory> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>war</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <!-- <inherited>false</inherited> --> - <configuration> - <target> - <ant antfile="build.xml" target="war"> - <property name="build.compiler" value="extJavac"/> - <property name="vaadin.version" value="${project.version}"/> - </ant> - </target> - </configuration> - </execution> - <!-- - <execution> - <id>test-tb3</id> - <phase>integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <ant antfile="build.xml" target="test-tb3"> - <property name="browsers.include" value="phantomjs1"/> - <property name="categories.exclude" value="push"/> - <property name="com.vaadin.testbench.max.retries" value="4"/> - <property name="com.vaadin.testbench.screenshot.directory" value="../../vaadin-screenshots"/> - <property name="extraParams" value="-ea"/> - <property name="teamcity.ant.junit-support.enabled" value="false"/> - <property name="useLocalWebDriver" value="true"/> - <property name="vaadin.maven.version" value="7.6.LATEST"/> - <property name="vaadin.version" value="${project.version}"/> - </ant> - </target> - </configuration> - </execution> - --> + <build> + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>result</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>war</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <!-- <inherited>false</inherited> --> + <configuration> + <target> + <ant antfile="build.xml" target="war"> + <property name="build.compiler" value="extJavac" /> + <property name="vaadin.version" value="${project.version}" /> + </ant> + </target> + </configuration> + </execution> + <!-- <execution> <id>test-tb3</id> <phase>integration-test</phase> <goals> + <goal>run</goal> </goals> <configuration> <target> <ant antfile="build.xml" + target="test-tb3"> <property name="browsers.include" value="phantomjs1"/> + <property name="categories.exclude" value="push"/> <property name="com.vaadin.testbench.max.retries" + value="4"/> <property name="com.vaadin.testbench.screenshot.directory" value="../../vaadin-screenshots"/> + <property name="extraParams" value="-ea"/> <property name="teamcity.ant.junit-support.enabled" + value="false"/> <property name="useLocalWebDriver" value="true"/> <property + name="vaadin.maven.version" value="7.6.LATEST"/> <property name="vaadin.version" + value="${project.version}"/> </ant> </target> </configuration> </execution> --> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.ivy</groupId> - <artifactId>ivy</artifactId> - <version>2.4.0</version> - </dependency> - </dependencies> - </plugin> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>2.4.0</version> + </dependency> + </dependencies> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> <configuration> - <skipStaging>true</skipStaging> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> </configuration> </plugin> </plugins> </pluginManagement> - </build> + </build> </project> |