@@ -114,7 +114,6 @@ | |||
<dependency> | |||
<groupId>javax.portlet</groupId> | |||
<artifactId>portlet-api</artifactId> | |||
<version>2.0</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> |
@@ -7,6 +7,7 @@ | |||
<version>1.1.0</version> | |||
<relativePath /> | |||
</parent> | |||
<!-- Needed by a plugin in release build --> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-bom</artifactId> | |||
<packaging>pom</packaging> |
@@ -7,6 +7,7 @@ | |||
<artifactId>vaadin-root</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<!-- Needed by a plugin in release build --> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-buildhelpers</artifactId> | |||
<name>vaadin-buildhelpers</name> |
@@ -7,6 +7,7 @@ | |||
<artifactId>vaadin-root</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<!-- Needed by a plugin in release build --> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-client-compiled</artifactId> | |||
<name>vaadin-client-compiled</name> | |||
@@ -96,7 +97,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<version>2.6</version> | |||
<configuration> | |||
<archive> | |||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> |
@@ -7,6 +7,7 @@ | |||
<artifactId>vaadin-root</artifactId> | |||
<version>8.2-SNAPSHOT</version> | |||
</parent> | |||
<!-- Needed by a plugin in release build --> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-client</artifactId> | |||
<name>vaadin-client</name> |
@@ -90,7 +90,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<version>2.6</version> | |||
<configuration> | |||
<archive> | |||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> |
@@ -273,7 +273,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<version>2.6</version> | |||
<configuration> | |||
<archive> | |||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> |
@@ -69,7 +69,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-compiler-plugin</artifactId> | |||
<version>3.1</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> |
@@ -159,7 +159,6 @@ | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>build-helper-maven-plugin</artifactId> | |||
<version>3.0.0</version> | |||
<executions> | |||
<execution> | |||
<id>add-source</id> |
@@ -19,7 +19,6 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-context-menu</artifactId> | |||
<version>${contextmenu.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> |
@@ -18,7 +18,6 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-context-menu</artifactId> | |||
<version>${contextmenu.version}</version> | |||
</dependency> | |||
</dependencies> |
@@ -18,9 +18,7 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-context-menu</artifactId> | |||
<version>${contextmenu.version}</version> | |||
</dependency> | |||
</dependencies> | |||
<build> |
@@ -16,7 +16,6 @@ | |||
<vaadin.version>8.2-SNAPSHOT</vaadin.version> | |||
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version> | |||
<failOnMissingWebXml>false</failOnMissingWebXml> | |||
<contextmenu.version>2.0-SNAPSHOT</contextmenu.version> | |||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | |||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | |||
<!-- Don't care about coding style for tests --> |
@@ -18,13 +18,11 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-server</artifactId> | |||
<version>${vaadin.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-themes</artifactId> | |||
<version>${vaadin.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
</dependencies> |
@@ -69,7 +69,6 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-client</artifactId> | |||
<version>${vaadin.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
</dependencies> | |||
@@ -95,7 +94,6 @@ | |||
<plugin> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-maven-plugin</artifactId> | |||
<version>${vaadin.plugin.version}</version> | |||
<executions> | |||
<execution> | |||
<goals> |
@@ -86,7 +86,6 @@ | |||
<plugin> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-maven-plugin</artifactId> | |||
<version>${vaadin.plugin.version}</version> | |||
<executions> | |||
<execution> | |||
<phase>process-resources</phase> |
@@ -32,14 +32,12 @@ | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-sass-compiler</artifactId> | |||
<version>${vaadin.sass.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.vaadin</groupId> | |||
<artifactId>vaadin-icons</artifactId> | |||
<version>${vaadin.icons.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
@@ -163,7 +161,6 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<version>2.6</version> | |||
<configuration> | |||
<archive> | |||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> |
@@ -72,19 +72,16 @@ | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-webapp</artifactId> | |||
<version>${jetty.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-util</artifactId> | |||
<version>${jetty.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-proxy</artifactId> | |||
<version>${jetty.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||