diff options
| author | Artur Signell <artur@vaadin.com> | 2016-09-09 13:11:17 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2016-09-09 10:32:17 +0000 |
| commit | 61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab (patch) | |
| tree | ac3af735a6e7281f7110bd793c996587f597e8dd | |
| parent | e5dece5b6e6c53b61f4c10ba9427548659dc5424 (diff) | |
| download | vaadin-framework-61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab.tar.gz vaadin-framework-61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab.zip | |
Format project pom files using correct settings (4 spaces)
Change-Id: I4b4760949897d2755da26a06f9048a596abdf0b6
| -rw-r--r-- | all/pom.xml | 738 | ||||
| -rw-r--r-- | buildhelpers/pom.xml | 166 | ||||
| -rw-r--r-- | client-compiler/pom.xml | 238 | ||||
| -rw-r--r-- | client/pom.xml | 260 | ||||
| -rw-r--r-- | compatibility-client-compiled/pom.xml | 331 | ||||
| -rw-r--r-- | compatibility-client/pom.xml | 186 | ||||
| -rw-r--r-- | compatibility-server/pom.xml | 224 | ||||
| -rw-r--r-- | compatibility-shared/pom.xml | 154 | ||||
| -rw-r--r-- | liferay/pom.xml | 253 | ||||
| -rw-r--r-- | pom.xml | 1073 | ||||
| -rw-r--r-- | push/pom.xml | 310 | ||||
| -rw-r--r-- | server/pom.xml | 481 | ||||
| -rw-r--r-- | shared/pom.xml | 294 | ||||
| -rw-r--r-- | themes/pom.xml | 652 | ||||
| -rw-r--r-- | uitest-common/pom.xml | 200 | ||||
| -rw-r--r-- | uitest/pom.xml | 608 | ||||
| -rw-r--r-- | widgets/pom.xml | 8 |
17 files changed, 3104 insertions, 3072 deletions
diff --git a/all/pom.xml b/all/pom.xml index 384b27d77f..be6511ff8f 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -1,368 +1,376 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-all</artifactId> - <name>vaadin-all</name> - <packaging>jar</packaging> - - <properties> - <relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file> - <webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir> - <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> - </properties> - - <url>https://vaadin.com/</url> - <description>Vaadin All package</description> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-shared</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-themes</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiler</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-shared</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-server</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-client</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-widgets</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- Release Notes --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>initialize</phase> - <id>parse-version</id> - <goals> - <goal>parse-version</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>filter-release-notes</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <loadfile property="release-notes-tickets" srcFile="${relnotes.tickets.file}" - failonerror="false" /> - <copy todir="${webcontent.dir}"> - <fileset dir="src/main/templates/"> - <patternset> - <include name="release-notes.html" /> - </patternset> - </fileset> - <filterchain> - <expandproperties /> - <replacetokens begintoken="@" endtoken="@"> - <token key="version" value="${project.version}" /> - <token key="version-minor" - value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}" /> - <token key="gwt-version" value="${vaadin.gwt.version}" /> - <token key="builddate" value="${maven.build.timestamp}" /> - <token key="release-notes-tickets" value="${release-notes-tickets}" /> - </replacetokens> - </filterchain> - </copy> - </target> - </configuration> - </execution> - </executions> - </plugin> - - <!-- vaadin-all zip --> - - <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>all-assembly-descriptor.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!-- Skip install, deploy and javadoc --> - - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <phase>never</phase> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <skipSource>true</skipSource> - </configuration> - </plugin> - - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <id>release</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>fetch-release-notes-tickets</id> - <phase>process-classes</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-Dvaadin.version=${project.version}</argument> - <argument>-classpath</argument> - <classpath /> - - <argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets - </argument> - </arguments> - <outputFile>${relnotes.tickets.file}</outputFile> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Extract sources for JavaDoc --> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>extract-sources</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-shared</artifactId> - <classifier>sources</classifier> - </artifactItem> - - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <classifier>sources</classifier> - </artifactItem> - - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client</artifactId> - <classifier>sources</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Add extracted sources --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source-path</id> - <phase>prepare-package</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${dependency.unpack.directory}</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Make Combined JavaDoc --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>generate-combined-javadoc</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <failOnError>false</failOnError> - <excludePackageNames>com.vaadin.buildhelpers</excludePackageNames> - <skip>false</skip> - <links> - <link>http://docs.oracle.com/javase/6/docs/api/</link> - <link>http://docs.oracle.com/j2ee/1.4/docs/api/</link> - </links> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> + 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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-all</artifactId> + <name>vaadin-all</name> + <packaging>jar</packaging> + + <properties> + <relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file> + <webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir> + <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> + </properties> + + <url>https://vaadin.com/</url> + <description>Vaadin All package</description> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-push</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-themes</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client-compiler</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client-compiled</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-shared</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-server</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-client</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-client-compiled</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-widgets</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <!-- Release Notes --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <phase>initialize</phase> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>filter-release-notes</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <loadfile property="release-notes-tickets" + srcFile="${relnotes.tickets.file}" + failonerror="false" /> + <copy todir="${webcontent.dir}"> + <fileset dir="src/main/templates/"> + <patternset> + <include + name="release-notes.html" /> + </patternset> + </fileset> + <filterchain> + <expandproperties /> + <replacetokens + begintoken="@" endtoken="@"> + <token key="version" + value="${project.version}" /> + <token key="version-minor" + value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}" /> + <token key="gwt-version" + value="${vaadin.gwt.version}" /> + <token key="builddate" + value="${maven.build.timestamp}" /> + <token + key="release-notes-tickets" + value="${release-notes-tickets}" /> + </replacetokens> + </filterchain> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + + <!-- vaadin-all zip --> + + <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>all-assembly-descriptor.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <!-- Skip install, deploy and javadoc --> + + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <configuration> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <phase>never</phase> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>release</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>fetch-release-notes-tickets</id> + <phase>process-classes</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-Dvaadin.version=${project.version}</argument> + <argument>-classpath</argument> + <classpath /> + + <argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets + </argument> + </arguments> + <outputFile>${relnotes.tickets.file}</outputFile> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Extract sources for JavaDoc --> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>extract-sources</id> + <phase>prepare-package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <classifier>sources</classifier> + </artifactItem> + + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <classifier>sources</classifier> + </artifactItem> + + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client</artifactId> + <classifier>sources</classifier> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Add extracted sources --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source-path</id> + <phase>prepare-package</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${dependency.unpack.directory}</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Make Combined JavaDoc --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>generate-combined-javadoc</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <failOnError>false</failOnError> + <excludePackageNames>com.vaadin.buildhelpers</excludePackageNames> + <skip>false</skip> + <links> + <link>http://docs.oracle.com/javase/6/docs/api/</link> + <link>http://docs.oracle.com/j2ee/1.4/docs/api/</link> + </links> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-gpg-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project> diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml index 5ea219297a..4b238df73e 100644 --- a/buildhelpers/pom.xml +++ b/buildhelpers/pom.xml @@ -1,91 +1,91 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-buildhelpers</artifactId> - <name>vaadin-buildhelpers</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-buildhelpers</artifactId> + <name>vaadin-buildhelpers</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin build helpers</description> + <url>https://vaadin.com/</url> + <description>Vaadin build helpers</description> - <dependencies> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + </dependency> - <dependency> - <groupId>com.carrotsearch</groupId> - <artifactId>smartsprites</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>smartsprites</artifactId> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> - <!-- Skip sources jar --> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <skipSource>true</skipSource> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <!-- Skip sources jar --> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <configuration> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index 35b5ce423a..1ccfccc666 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -1,126 +1,126 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-client-compiler</artifactId> - <name>vaadin-client-compiler</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-client-compiler</artifactId> + <name>vaadin-client-compiler</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin client compiler</description> + <url>https://vaadin.com/</url> + <description>Vaadin client compiler</description> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + </dependency> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> - <!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> --> - <Import-Package></Import-Package> <!--todo find out what should be in Import-Package --> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index /> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> --> + <Import-Package></Import-Package> <!--todo find out what should be in Import-Package --> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index /> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/client/pom.xml b/client/pom.xml index cf540bd47f..ca6009a007 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,144 +1,144 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client</artifactId> - <name>vaadin-client</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client</artifactId> + <name>vaadin-client</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin client</description> + <url>https://vaadin.com/</url> + <description>Vaadin client</description> - <dependencies> - <!-- LIBRARY DEPENDENCIES (compile time) --> - <!-- Project modules --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-shared</artifactId> - <version>${project.version}</version> - </dependency> + <dependencies> + <!-- LIBRARY DEPENDENCIES (compile time) --> + <!-- Project modules --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + </exclusion> + </exclusions> + </dependency> - <!-- Needed GWT dependencies, includes gwt-user --> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - </dependency> - </dependencies> + <!-- Needed GWT dependencies, includes gwt-user --> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - </resource> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> - <Import-Package></Import-Package> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <Import-Package></Import-Package> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Vaadin-Package-Version>1</Vaadin-Package-Version> - <Vaadin-Widgetsets>com.vaadin.DefaultWidgetSet</Vaadin-Widgetsets> - </manifestEntries> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Vaadin-Package-Version>1</Vaadin-Package-Version> + <Vaadin-Widgetsets>com.vaadin.DefaultWidgetSet</Vaadin-Widgetsets> + </manifestEntries> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/compatibility-client-compiled/pom.xml b/compatibility-client-compiled/pom.xml index da8e7c6866..298f402bf6 100644 --- a/compatibility-client-compiled/pom.xml +++ b/compatibility-client-compiled/pom.xml @@ -1,183 +1,184 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-compatibility-client-compiled</artifactId> - <name>vaadin-compatibility-client-compiled</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-compatibility-client-compiled</artifactId> + <name>vaadin-compatibility-client-compiled</name> + <packaging>jar</packaging> - <properties> - <widgetset.name>com.vaadin.v7.Vaadin7WidgetSet</widgetset.name> - <widgetset.style>OBF</widgetset.style> - <widgetset.local.workers>6</widgetset.local.workers> - </properties> + <properties> + <widgetset.name>com.vaadin.v7.Vaadin7WidgetSet</widgetset.name> + <widgetset.style>OBF</widgetset.style> + <widgetset.local.workers>6</widgetset.local.workers> + </properties> - <url>https://vaadin.com/</url> - <description>Vaadin 7 compatibility client compiled</description> + <url>https://vaadin.com/</url> + <description>Vaadin 7 compatibility client compiled</description> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-server</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-server</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-client</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-client</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client-compiler</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client-compiler</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-buildhelpers</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-buildhelpers</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-export-package</id> - <phase>package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument> - <argument>-DincludeNumberPackages=1</argument> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-export-package</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument> + <argument>-DincludeNumberPackages=1</argument> - <argument>-classpath</argument> - <classpath /> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> + <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> - <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument> - <argument>VAADIN/widgetsets</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> + <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument> + <argument>VAADIN/widgetsets</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <configuration> - <modules> - <module>${widgetset.name}</module> - </modules> - <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory> - <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir> - <style>${widgetset.style}</style> - <extraJvmArgs>-Xmx1G</extraJvmArgs> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-maven-plugin</artifactId> + <configuration> + <modules> + <module>${widgetset.name}</module> + </modules> + <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory> + <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir> + <style>${widgetset.style}</style> + <extraJvmArgs>-Xmx1G</extraJvmArgs> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <!-- Export package is handled in exec plugin --> - <Export-Package></Export-Package> - <Import-Package></Import-Package> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <!-- Export package is handled in exec plugin --> + <Export-Package></Export-Package> + <Import-Package></Import-Package> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> - <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> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - exec-maven-plugin - </artifactId> - <versionRange> - [1.4.0,) - </versionRange> - <goals> - <goal>exec</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <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> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse + m2e settings only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.codehaus.mojo + </groupId> + <artifactId> + exec-maven-plugin + </artifactId> + <versionRange> + [1.4.0,) + </versionRange> + <goals> + <goal>exec</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/compatibility-client/pom.xml b/compatibility-client/pom.xml index 316b64fa1a..b5bdf183a9 100644 --- a/compatibility-client/pom.xml +++ b/compatibility-client/pom.xml @@ -1,102 +1,102 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-compatibility-client</artifactId> - <name>vaadin-compatibility-client</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-compatibility-client</artifactId> + <name>vaadin-compatibility-client</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin 7 compatibility package for Vaadin 8</description> + <url>https://vaadin.com/</url> + <description>Vaadin 7 compatibility package for Vaadin 8</description> - <dependencies> - <!-- Project modules --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-shared</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <!-- Project modules --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-shared</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Vaadin-Package-Version>1</Vaadin-Package-Version> - <Vaadin-Widgetsets>com.vaadin.v7.Vaadin7WidgetSet</Vaadin-Widgetsets> - </manifestEntries> - </archive> - </configuration> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Vaadin-Package-Version>1</Vaadin-Package-Version> + <Vaadin-Widgetsets>com.vaadin.v7.Vaadin7WidgetSet</Vaadin-Widgetsets> + </manifestEntries> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - </resource> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml index 024cefc001..642ab89930 100644 --- a/compatibility-server/pom.xml +++ b/compatibility-server/pom.xml @@ -1,123 +1,123 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-compatibility-server</artifactId> - <name>vaadin-compatibility-server</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-compatibility-server</artifactId> + <name>vaadin-compatibility-server</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin 7 compatibility package for Vaadin 8</description> + <url>https://vaadin.com/</url> + <description>Vaadin 7 compatibility package for Vaadin 8</description> - <dependencies> - <!-- Project modules --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-shared</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - <!-- Bean Validation API --> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - </dependencies> + <dependencies> + <!-- Project modules --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-shared</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + <!-- Bean Validation API --> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Export-Package>com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.v7.*;version="${osgi.bundle.version}"</Export-Package> - <Require-Bundle> - com.vaadin.server;bundle-version="${osgi.bundle.version}", - com.vaadin.shared;bundle-version="${osgi.bundle.version}" - </Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <Require-Bundle> + com.vaadin.server;bundle-version="${osgi.bundle.version}", + com.vaadin.shared;bundle-version="${osgi.bundle.version}" + </Require-Bundle> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/compatibility-shared/pom.xml b/compatibility-shared/pom.xml index aa5a27ab8c..30886a1ac1 100644 --- a/compatibility-shared/pom.xml +++ b/compatibility-shared/pom.xml @@ -1,67 +1,67 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-compatibility-shared</artifactId> - <name>vaadin-compatibility-shared</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-compatibility-shared</artifactId> + <name>vaadin-compatibility-shared</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin 7 compatibility package for Vaadin 8</description> + <url>https://vaadin.com/</url> + <description>Vaadin 7 compatibility package for Vaadin 8</description> - <dependencies> - <!-- Project modules --> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-shared</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependencies> + <!-- Project modules --> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> - <Require-Bundle> - com.vaadin.shared;bundle-version="${osgi.bundle.version}" - </Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <Require-Bundle> + com.vaadin.shared;bundle-version="${osgi.bundle.version}" + </Require-Bundle> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -91,25 +91,25 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/liferay/pom.xml b/liferay/pom.xml index 086f3a435c..5491260197 100644 --- a/liferay/pom.xml +++ b/liferay/pom.xml @@ -1,139 +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>8.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>8.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> + <url>https://vaadin.com/</url> + <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/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> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <artifactItem> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-themes</artifactId> + <includes> + VAADIN/themes/base/**, + VAADIN/themes/chameleon/**, + 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> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> @@ -1,558 +1,559 @@ <?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-parent</artifactId> - <version>1.0.0</version> - </parent> - <artifactId>vaadin-root</artifactId> - <name>vaadin-root</name> - <packaging>pom</packaging> - <version>8.0-SNAPSHOT</version> + 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-parent</artifactId> + <version>1.0.0</version> + </parent> + <artifactId>vaadin-root</artifactId> + <name>vaadin-root</name> + <packaging>pom</packaging> + <version>8.0-SNAPSHOT</version> - <prerequisites> - <maven>3.0.5</maven> - </prerequisites> + <prerequisites> + <maven>3.0.5</maven> + </prerequisites> - <properties> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Used version numbers for dependencies --> - <liferay.portal.version>6.0.2</liferay.portal.version> - <jetty.version>9.3.9.v20160517</jetty.version> + <!-- Used version numbers for dependencies --> + <liferay.portal.version>6.0.2</liferay.portal.version> + <jetty.version>9.3.9.v20160517</jetty.version> - <vaadin.gwt.version>2.8.0-rc2</vaadin.gwt.version> - <vaadin.plugin.version>8.0-SNAPSHOT</vaadin.plugin.version> + <vaadin.gwt.version>2.8.0-rc2</vaadin.gwt.version> + <vaadin.plugin.version>8.0-SNAPSHOT</vaadin.plugin.version> - <!-- Used in OSGi manifests --> - <javax.validation.version>1.0.0.GA</javax.validation.version> - <jsoup.version>1.8.3</jsoup.version> - <javax.portlet.version>2.0</javax.portlet.version> - <vaadin.sass.version>0.9.13</vaadin.sass.version> - <!-- Note that this should be kept in sync with the class Constants --> - <atmosphere.runtime.version>2.4.5.vaadin1</atmosphere.runtime.version> + <!-- Used in OSGi manifests --> + <javax.validation.version>1.0.0.GA</javax.validation.version> + <jsoup.version>1.8.3</jsoup.version> + <javax.portlet.version>2.0</javax.portlet.version> + <vaadin.sass.version>0.9.13</vaadin.sass.version> + <!-- Note that this should be kept in sync with the class Constants --> + <atmosphere.runtime.version>2.4.5.vaadin1</atmosphere.runtime.version> - <!-- OSGi --> - <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version> - <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment> - <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version> + <!-- OSGi --> + <osgi.javax.servlet.version>3.0.0</osgi.javax.servlet.version> + <osgi.execution.environment>JavaSE-1.8</osgi.execution.environment> + <osgi.bundle.version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</osgi.bundle.version> - <!-- Dependency unpack directory --> - <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> - </properties> + <!-- Dependency unpack directory --> + <dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory> + </properties> - <!-- TODO: remove this after maven plugin has been released --> - <pluginRepositories> - <pluginRepository> - <id>vaadin-prereleases</id> - <url>http://maven.vaadin.com/vaadin-prereleases</url> - </pluginRepository> - <pluginRepository> - <id>vaadin-snapshots</id> - <url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> + <!-- TODO: remove this after maven plugin has been released --> + <pluginRepositories> + <pluginRepository> + <id>vaadin-prereleases</id> + <url>http://maven.vaadin.com/vaadin-prereleases</url> + </pluginRepository> + <pluginRepository> + <id>vaadin-snapshots</id> + <url>https://oss.sonatype.org/content/repositories/vaadin-snapshots/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> - <organization> - <name>Vaadin Ltd</name> - </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> + <organization> + <name>Vaadin Ltd</name> + </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> - <modules> - <module>buildhelpers</module> - <module>shared</module> - <module>push</module> - <module>server</module> - <module>client</module> - <module>client-compiler</module> - <module>client-compiled</module> - <module>themes</module> - <module>widgets</module> - <module>uitest-common</module> - <module>uitest</module> - <module>liferay</module> - <module>all</module> - <module>compatibility-server</module> - <module>compatibility-client</module> - <module>compatibility-client-compiled</module> - <module>compatibility-shared</module> - <!-- Nexus staging bug needs the last module to be deployed. --> - <module>bom</module> - </modules> + <modules> + <module>buildhelpers</module> + <module>shared</module> + <module>push</module> + <module>server</module> + <module>client</module> + <module>client-compiler</module> + <module>client-compiled</module> + <module>themes</module> + <module>widgets</module> + <module>uitest-common</module> + <module>uitest</module> + <module>liferay</module> + <module>all</module> + <module>compatibility-server</module> + <module>compatibility-client</module> + <module>compatibility-client-compiled</module> + <module>compatibility-shared</module> + <!-- Nexus staging bug needs the last module to be deployed. --> + <module>bom</module> + </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - <version>${vaadin.sass.version}</version> - </dependency> - <dependency> - <groupId>com.carrotsearch</groupId> - <artifactId>smartsprites</artifactId> - <version>0.2.10</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${vaadin.gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <version>${vaadin.gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${vaadin.gwt.version}</version> - </dependency> - <dependency> - <groupId>com.vaadin.external.atmosphere</groupId> - <artifactId>atmosphere-runtime</artifactId> - <version>${atmosphere.runtime.version}</version> - </dependency> - <dependency> - <groupId>com.vaadin.external.atmosphere.client</groupId> - <artifactId>javascript</artifactId> - <type>war</type> - <version>2.3.2.vaadin1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>${javax.portlet.version}</version> - </dependency> - <dependency> - <groupId>com.google.appengine</groupId> - <artifactId>appengine-api-1.0-sdk</artifactId> - <version>1.7.7</version> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>${javax.validation.version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.2.0.Final</version> - </dependency> - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>${jsoup.version}</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - </dependency> - <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> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-proxy</artifactId> - <version>${jetty.version}</version> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.52</version> - </dependency> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>3.5.1.201410131835-r</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + <version>${vaadin.sass.version}</version> + </dependency> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>smartsprites</artifactId> + <version>0.2.10</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${vaadin.gwt.version}</version> + </dependency> + <dependency> + <groupId>com.vaadin.external.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> + <version>${atmosphere.runtime.version}</version> + </dependency> + <dependency> + <groupId>com.vaadin.external.atmosphere.client</groupId> + <artifactId>javascript</artifactId> + <type>war</type> + <version>2.3.2.vaadin1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>${javax.portlet.version}</version> + </dependency> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <version>1.7.7</version> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>${javax.validation.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.2.0.Final</version> + </dependency> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>${jsoup.version}</version> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.9.5</version> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + </dependency> + <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> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-proxy</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + <version>0.1.52</version> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <version>3.5.1.201410131835-r</version> + </dependency> + </dependencies> + </dependencyManagement> - <!-- Common test dependencies --> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <!-- Common test dependencies --> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.0.0</version> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <!-- Downgraded due to filtering related bug --> - <version>2.6</version> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>3.5</version> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>3.0.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <configuration> - <outputDirectory>${dependency.unpack.directory}</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.10</version> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>3.0.0</version> - </plugin> - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <version>${vaadin.plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <dependencies> - <!-- Needed because of a JavadocMethodCheck bug in 6.11 --> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>6.17</version> - </dependency> - </dependencies> - <configuration> - <configLocation>../checkstyle/vaadin-checkstyle.xml</configLocation> - <headerLocation>../checkstyle/header</headerLocation> - <suppressionsLocation>../checkstyle/suppressions.xml</suppressionsLocation> - <encoding>UTF-8</encoding> - <consoleOutput>false</consoleOutput> - <failsOnError>false</failsOnError> - <linkXRef>false</linkXRef> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.15</version> - </plugin> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.maven.plugins - </groupId> - <artifactId> - maven-antrun-plugin - </artifactId> - <versionRange> - [1.8,) - </versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.5.1</version> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <!-- Downgraded due to filtering related bug --> + <version>2.6</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>3.5</version> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.0.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <configuration> + <outputDirectory>${dependency.unpack.directory}</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.4.0</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.10</version> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.0</version> + </plugin> + <plugin> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-maven-plugin</artifactId> + <version>${vaadin.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <dependencies> + <!-- Needed because of a JavadocMethodCheck bug in + 6.11 --> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>6.17</version> + </dependency> + </dependencies> + <configuration> + <configLocation>../checkstyle/vaadin-checkstyle.xml</configLocation> + <headerLocation>../checkstyle/header</headerLocation> + <suppressionsLocation>../checkstyle/suppressions.xml</suppressionsLocation> + <encoding>UTF-8</encoding> + <consoleOutput>false</consoleOutput> + <failsOnError>false</failsOnError> + <linkXRef>false</linkXRef> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + </plugin> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.apache.maven.plugins + </groupId> + <artifactId> + maven-antrun-plugin + </artifactId> + <versionRange> + [1.8,) + </versionRange> + <goals> + <goal>run</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <executions> - <execution> - <id>java8compatibility</id> - <phase>test</phase> - <goals> - <goal>check</goal> - </goals> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java18</artifactId> - <version>1.0</version> - </signature> - <ignores> - <ignore>com.google.gwt.*</ignore> - </ignores> - </configuration> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <executions> + <execution> + <id>java8compatibility</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + <ignores> + <ignore>com.google.gwt.*</ignore> + </ignores> + </configuration> + </execution> + </executions> + </plugin> - <!-- Unpacked Dependencies as resource --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> + <!-- Unpacked Dependencies as resource --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> - <!-- Needs extra resource folder for unpacked dependencies --> - <executions> - <execution> - <id>add-dependency-resources</id> - <phase>generate-resources</phase> - <goals> - <goal>add-resource</goal> - </goals> - <configuration> - <resources> - <resource> - <directory>${dependency.unpack.directory}</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>parse-version</id> - <goals> - <goal>parse-version</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- Needs extra resource folder for unpacked dependencies --> + <executions> + <execution> + <id>add-dependency-resources</id> + <phase>generate-resources</phase> + <goals> + <goal>add-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${dependency.unpack.directory}</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>parse-version</id> + <goals> + <goal>parse-version</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <id>release</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <vaadin.plugin.version>${project.version}</vaadin.plugin.version> - </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>sources-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <!-- Only include java files --> - <includes> - <include>**/*.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.3</version> - <executions> - <execution> - <id>generate-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <failOnError>false</failOnError> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>release</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <vaadin.plugin.version>${project.version}</vaadin.plugin.version> + </properties> + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>sources-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <!-- Only include java files --> + <includes> + <include>**/*.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.3</version> + <executions> + <execution> + <id>generate-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <failOnError>false</failOnError> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/push/pom.xml b/push/pom.xml index 71ecbad0cd..f0ad9d7e39 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -1,168 +1,176 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-push</artifactId> - <name>vaadin-push</name> - <packaging>jar</packaging> - <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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-push</artifactId> + <name>vaadin-push</name> + <packaging>jar</packaging> + <properties> - </properties> + </properties> - <url>https://vaadin.com/</url> - <description>Vaadin server push support</description> + <url>https://vaadin.com/</url> + <description>Vaadin server push support</description> - <dependencies> - <!-- Atmosphere --> - <dependency> - <groupId>com.vaadin.external.atmosphere</groupId> - <artifactId>atmosphere-runtime</artifactId> - </dependency> - <dependency> - <groupId>com.vaadin.external.atmosphere.client</groupId> - <artifactId>javascript</artifactId> - <type>war</type> - <scope>provided</scope> - </dependency> + <dependencies> + <!-- Atmosphere --> + <dependency> + <groupId>com.vaadin.external.atmosphere</groupId> + <artifactId>atmosphere-runtime</artifactId> + </dependency> + <dependency> + <groupId>com.vaadin.external.atmosphere.client</groupId> + <artifactId>javascript</artifactId> + <type>war</type> + <scope>provided</scope> + </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>default-cli</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <!-- <inherited>false</inherited> --> - <configuration> - <target> - <property name="javascript.unpack" location="${project.build.directory}/temp" /> - <property name="vaadinPush.js" - location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" /> - <property name="templates.dir" - location="${project.build.sourceDirectory}/../templates" /> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>default-cli</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <!-- <inherited>false</inherited> --> + <configuration> + <target> + <property name="javascript.unpack" + location="${project.build.directory}/temp" /> + <property name="vaadinPush.js" + location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" /> + <property name="templates.dir" + location="${project.build.sourceDirectory}/../templates" /> - <!-- Unzip to temp dir --> - <unzip - src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}" - dest="${javascript.unpack}"> - <patternset> - <include name="**/atmosphere.js" /> - </patternset> - <mapper type="flatten" /> - </unzip> - <loadfile srcfile="${javascript.unpack}/atmosphere.js" - property="atmosphere.js.contents" /> + <!-- Unzip to temp dir --> + <unzip + src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}" + dest="${javascript.unpack}"> + <patternset> + <include name="**/atmosphere.js" /> + </patternset> + <mapper type="flatten" /> + </unzip> + <loadfile + srcfile="${javascript.unpack}/atmosphere.js" + property="atmosphere.js.contents" /> - <loadfile srcfile="${templates.dir}/vaadinPush.js.tpl" - property="vaadinPush.js.contents"> - <filterchain> - <replacetokens begintoken="@" endtoken="@"> - <token key="atmosphere.js" value="${atmosphere.js.contents}" /> - </replacetokens> - </filterchain> - </loadfile> - <!-- Non-obfuscated version for debugging --> - <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo> + <loadfile + srcfile="${templates.dir}/vaadinPush.js.tpl" + property="vaadinPush.js.contents"> + <filterchain> + <replacetokens + begintoken="@" endtoken="@"> + <token key="atmosphere.js" + value="${atmosphere.js.contents}" /> + </replacetokens> + </filterchain> + </loadfile> + <!-- Non-obfuscated version for debugging --> + <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo> - </target> - </configuration> - </execution> + </target> + </configuration> + </execution> - <execution> - <id>compresspush</id> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="vaadinPush.debug.js" - location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" /> - <property name="vaadinPush-min.js" - location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug-min.js" /> - <property name="vaadinPush.js" - location="${project.build.outputDirectory}/VAADIN/vaadinPush.js" /> + <execution> + <id>compresspush</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="vaadinPush.debug.js" + location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" /> + <property name="vaadinPush-min.js" + location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug-min.js" /> + <property name="vaadinPush.js" + location="${project.build.outputDirectory}/VAADIN/vaadinPush.js" /> - <move file="${vaadinPush-min.js}" tofile="${vaadinPush.js}" /> + <move file="${vaadinPush-min.js}" + tofile="${vaadinPush.js}" /> - <!-- Gzipped versions --> - <gzip src="${vaadinPush.debug.js}" destfile="${vaadinPush.debug.js}.gz" /> - <gzip src="${vaadinPush.js}" destfile="${vaadinPush.js}.gz" /> - </target> - </configuration> - </execution> - </executions> - </plugin> + <!-- Gzipped versions --> + <gzip src="${vaadinPush.debug.js}" + destfile="${vaadinPush.debug.js}.gz" /> + <gzip src="${vaadinPush.js}" + destfile="${vaadinPush.js}.gz" /> + </target> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>yuicompressor-maven-plugin</artifactId> - <version>1.5.1</version> - <executions> - <execution> - <id>minifyjs</id> - <phase>process-resources</phase> - <goals> - <goal>compress</goal> - </goals> - </execution> - </executions> - <configuration> - <sourceDirectory>${project.build.outputDirectory}/VAADIN</sourceDirectory> - <includes> - <include>vaadinPush.debug.js</include> - </includes> - <outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory> - </configuration> - </plugin> + <plugin> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <version>1.5.1</version> + <executions> + <execution> + <id>minifyjs</id> + <phase>process-resources</phase> + <goals> + <goal>compress</goal> + </goals> + </execution> + </executions> + <configuration> + <sourceDirectory>${project.build.outputDirectory}/VAADIN</sourceDirectory> + <includes> + <include>vaadinPush.debug.js</include> + </includes> + <outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Export-Package>VAADIN</Export-Package> - <Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Export-Package>VAADIN</Export-Package> + <Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/server/pom.xml b/server/pom.xml index 27edf34288..616558cdea 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,244 +1,245 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-server</artifactId> - <name>vaadin-server</name> - <packaging>jar</packaging> - - <url>https://vaadin.com/</url> - <description>Vaadin server</description> - - <dependencies> - <!-- API DEPENDENCIES --> - - <!-- Liferay Portal Service --> - <dependency> - <groupId>com.liferay.portal</groupId> - <artifactId>portal-service</artifactId> - <version>${liferay.portal.version}</version> - <scope>provided</scope> - </dependency> - - <!--Servlet API --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <!--Portlet API --> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Google App Engine --> - <dependency> - <groupId>com.google.appengine</groupId> - <artifactId>appengine-api-1.0-sdk</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Bean Validation API --> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <scope>provided</scope> - <optional>true</optional> - </dependency> - - <!-- Sass compiler --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - </dependency> - - <!-- LIBRARY DEPENDENCIES (compile time) --> - <!-- Project modules --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-shared</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Jsoup for BootstrapHandler --> - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - </dependency> - - <!-- TESTING DEPENDENCIES --> - - <!-- Test dependencies --> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - - <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> - <!-- <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>9.1-901.jdbc3</version></dependency> --> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - </resource> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>compressbootstrap</id> - <phase>prepare-package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="vaadinBootstrap.js" - location="${project.build.outputDirectory}/VAADIN/vaadinBootstrap.js" /> - - <!-- Gzipped version --> - <gzip src="${vaadinBootstrap.js}" destfile="${vaadinBootstrap.js}.gz" /> - </target> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> - <Import-Package>javax.servlet;version="${osgi.javax.servlet.version}", - javax.servlet.http;version="${osgi.javax.servlet.version}", - javax.validation;version="${javax.validation.version}";resolution:=optional, - org.jsoup;version="${jsoup.version}", - org.jsoup.parser;version="${jsoup.version}", - org.jsoup.nodes;version="${jsoup.version}", - org.jsoup.helper;version="${jsoup.version}", - org.jsoup.safety;version="${jsoup.version}", - org.jsoup.select;version="${jsoup.version}", - javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, - javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, - com.liferay.portal.kernel.util;resolution:=optional</Import-Package> - <Require-Bundle> - com.vaadin.shared;bundle-version="${osgi.bundle.version}", - com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, - com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional</Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - <!-- Package src/test into a jar so that compatbility-server can use - the same test classes, e.g. test beans --> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + 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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-server</artifactId> + <name>vaadin-server</name> + <packaging>jar</packaging> + + <url>https://vaadin.com/</url> + <description>Vaadin server</description> + + <dependencies> + <!-- API DEPENDENCIES --> + + <!-- Liferay Portal Service --> + <dependency> + <groupId>com.liferay.portal</groupId> + <artifactId>portal-service</artifactId> + <version>${liferay.portal.version}</version> + <scope>provided</scope> + </dependency> + + <!--Servlet API --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <!--Portlet API --> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Google App Engine --> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <scope>provided</scope> + </dependency> + + <!-- Bean Validation API --> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency> + + <!-- Sass compiler --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + </dependency> + + <!-- LIBRARY DEPENDENCIES (compile time) --> + <!-- Project modules --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-shared</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-push</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Jsoup for BootstrapHandler --> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + </dependency> + + <!-- TESTING DEPENDENCIES --> + + <!-- Test dependencies --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + + <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> + <!-- <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>9.1-901.jdbc3</version></dependency> --> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>compressbootstrap</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="vaadinBootstrap.js" + location="${project.build.outputDirectory}/VAADIN/vaadinBootstrap.js" /> + + <!-- Gzipped version --> + <gzip src="${vaadinBootstrap.js}" + destfile="${vaadinBootstrap.js}.gz" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}"</Export-Package> + <Import-Package>javax.servlet;version="${osgi.javax.servlet.version}", + javax.servlet.http;version="${osgi.javax.servlet.version}", + javax.validation;version="${javax.validation.version}";resolution:=optional, + org.jsoup;version="${jsoup.version}", + org.jsoup.parser;version="${jsoup.version}", + org.jsoup.nodes;version="${jsoup.version}", + org.jsoup.helper;version="${jsoup.version}", + org.jsoup.safety;version="${jsoup.version}", + org.jsoup.select;version="${jsoup.version}", + javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional, + javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional, + com.liferay.portal.kernel.util;resolution:=optional</Import-Package> + <Require-Bundle> + com.vaadin.shared;bundle-version="${osgi.bundle.version}", + com.vaadin.push;bundle-version="${osgi.bundle.version}";resolution:=optional, + com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional</Require-Bundle> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + <!-- Package src/test into a jar so that compatbility-server + can use the same test classes, e.g. test beans --> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/shared/pom.xml b/shared/pom.xml index 4d558ca20e..c896f6f744 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -1,161 +1,161 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-shared</artifactId> - <name>vaadin-shared</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-shared</artifactId> + <name>vaadin-shared</name> + <packaging>jar</packaging> - <properties> - </properties> + <properties> + </properties> - <url>https://vaadin.com/</url> - <description>Vaadin shared</description> + <url>https://vaadin.com/</url> + <description>Vaadin shared</description> - <dependencies> - <!-- Needed GWT dependencies. Required parts are packaged to jar --> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <!-- Needed GWT dependencies. Required parts are packaged to jar --> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <plugins> - <!-- Generated Version.java --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>templating-maven-plugin</artifactId> - <version>1.0.0</version> - <executions> - <execution> - <goals> - <goal>filter-sources</goal> - </goals> - </execution> - </executions> - </plugin> + <build> + <plugins> + <!-- Generated Version.java --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>templating-maven-plugin</artifactId> + <version>1.0.0</version> + <executions> + <execution> + <goals> + <goal>filter-sources</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- Copy needed GWT dependencies to package --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-dependencies</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <includes> - elemental/json/**, - elemental/util/Array*, - elemental/util/Can*, - elemental/util/Map* - </includes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - + <!-- Copy needed GWT dependencies to package --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-dependencies</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <includes> + elemental/json/**, + elemental/util/Array*, + elemental/util/Can*, + elemental/util/Map* + </includes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- Copy .java files to package --> - <execution> - <id>copy-sources</id> - <!-- here the phase you need --> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/java</directory> - <filtering>false</filtering> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/java-templates</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Export-Package>com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}"</Export-Package> - <Import-Package></Import-Package> - <Require-Bundle></Require-Bundle> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <!-- Copy .java files to package --> + <execution> + <id>copy-sources</id> + <!-- here the phase you need --> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/java</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/java-templates</directory> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Export-Package>com.vaadin.*;version="${osgi.bundle.version}",elemental.*;version="${osgi.bundle.version}"</Export-Package> + <Import-Package></Import-Package> + <Require-Bundle></Require-Bundle> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>checkstyle</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>checkstyle</goal> + </goals> + <phase>process-sources</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> </project> diff --git a/themes/pom.xml b/themes/pom.xml index 15ef3c09ed..b0d3d87360 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -1,352 +1,364 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-themes</artifactId> - <name>vaadin-themes</name> - <packaging>jar</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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-themes</artifactId> + <name>vaadin-themes</name> + <packaging>jar</packaging> - <url>https://vaadin.com/</url> - <description>Vaadin themes</description> + <url>https://vaadin.com/</url> + <description>Vaadin themes</description> - <dependencies> - <!-- Maven plugin scans for vaadin-server... --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-buildhelpers</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <dependencies> + <!-- Maven plugin scans for vaadin-server... --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-server</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-buildhelpers</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>com.carrotsearch</groupId> - <artifactId>smartsprites</artifactId> - <scope>provided</scope> - </dependency> - <!-- smartsprites dependency --> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependency> + <groupId>com.carrotsearch</groupId> + <artifactId>smartsprites</artifactId> + <scope>provided</scope> + </dependency> + <!-- smartsprites dependency --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-theme-sources</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>src/main/themes</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/base.scss</exclude> - <exclude>**/valo/shared/_global.scss</exclude> - </excludes> - </resource> - <resource> - <directory>src/main/themes</directory> - <filtering>true</filtering> - <includes> - <include>**/base.scss</include> - <include>**/valo/shared/_global.scss</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-theme-sources</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>src/main/themes</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/base.scss</exclude> + <exclude>**/valo/shared/_global.scss</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/themes</directory> + <filtering>true</filtering> + <includes> + <include>**/base.scss</include> + <include>**/valo/shared/_global.scss</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <configuration> - <compressTheme>true</compressTheme> - <warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory> - </configuration> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>compile-theme</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-maven-plugin</artifactId> + <configuration> + <compressTheme>true</compressTheme> + <warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory> + </configuration> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>compile-theme</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>compile-legacy-base</id> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>compile-legacy-base</id> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.sass.SassCompiler</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css</argument> - </arguments> - </configuration> - </execution> + <argument>com.vaadin.sass.SassCompiler</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css</argument> + </arguments> + </configuration> + </execution> - <execution> - <id>compile-legacy-chameleon</id> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> + <execution> + <id>compile-legacy-chameleon</id> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.sass.SassCompiler</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>compile-legacy-reindeer</id> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> + <argument>com.vaadin.sass.SassCompiler</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>compile-legacy-reindeer</id> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.sass.SassCompiler</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>compile-legacy-runo</id> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> + <argument>com.vaadin.sass.SassCompiler</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>compile-legacy-runo</id> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.sass.SassCompiler</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss</argument> - <argument> ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>smart-sprite-reindeer</id> - <phase>process-resources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-classpath</argument> - <classpath /> + <argument>com.vaadin.sass.SassCompiler</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss</argument> + <argument> + ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>smart-sprite-reindeer</id> + <phase>process-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-classpath</argument> + <classpath /> - <argument>org.carrot2.labs.smartsprites.SmartSprites</argument> + <argument>org.carrot2.labs.smartsprites.SmartSprites</argument> - <argument>--sprite-png-depth</argument> - <argument>AUTO</argument> + <argument>--sprite-png-depth</argument> + <argument>AUTO</argument> - <argument>--css-file-encoding</argument> - <argument>UTF-8</argument> + <argument>--css-file-encoding</argument> + <argument>UTF-8</argument> - <argument>--root-dir-path</argument> - <argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument> + <argument>--root-dir-path</argument> + <argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument> - <argument>--log-level</argument> - <argument>WARN</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>generate-export-package</id> - <phase>package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <classpathScope>compile</classpathScope> - <executable>${java.home}/bin/java</executable> - <arguments> - <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument> - <argument>-DincludeNumberPackages=0</argument> + <argument>--log-level</argument> + <argument>WARN</argument> + </arguments> + </configuration> + </execution> + <execution> + <id>generate-export-package</id> + <phase>package</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <classpathScope>compile</classpathScope> + <executable>${java.home}/bin/java</executable> + <arguments> + <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument> + <argument>-DincludeNumberPackages=0</argument> - <argument>-classpath</argument> - <classpath /> + <argument>-classpath</argument> + <classpath /> - <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> + <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> - <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument> - <argument>VAADIN/themes</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> + <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument> + <argument>VAADIN/themes</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>repackage-reindeer</id> - <phase>process-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <property name="reindeer.theme.path" - value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" /> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>repackage-reindeer</id> + <phase>process-classes</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="reindeer.theme.path" + value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" /> - <move file="${reindeer.theme.path}/styles-sprite.css" - tofile="${reindeer.theme.path}/styles.css" /> + <move + file="${reindeer.theme.path}/styles-sprite.css" + tofile="${reindeer.theme.path}/styles.css" /> - <move file="${reindeer.theme.path}/legacy-styles-sprite.css" - tofile="${reindeer.theme.path}/legacy-styles.css" /> + <move + file="${reindeer.theme.path}/legacy-styles-sprite.css" + tofile="${reindeer.theme.path}/legacy-styles.css" /> - <gzip src="${reindeer.theme.path}/styles.css" destfile="${reindeer.theme.path}/styles.css.gz" /> - </target> - </configuration> - </execution> - </executions> - </plugin> + <gzip + src="${reindeer.theme.path}/styles.css" + destfile="${reindeer.theme.path}/styles.css.gz" /> + </target> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Version>${osgi.bundle.version}</Bundle-Version> - <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> - <!-- Export package is handled in exec plugin --> - <Export-Package></Export-Package> - <Import-Package></Import-Package> - </instructions> - </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>prepare-package</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Version>${osgi.bundle.version}</Bundle-Version> + <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> + <!-- Export package is handled in exec plugin --> + <Export-Package></Export-Package> + <Import-Package></Import-Package> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>prepare-package</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> - <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> - <index>false</index> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> + <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> + <index>false</index> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <skipSource>true</skipSource> - </configuration> - </plugin> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - exec-maven-plugin - </artifactId> - <versionRange> - [1.4.0,) - </versionRange> - <goals> - <goal>exec</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <skipSource>true</skipSource> + </configuration> + </plugin> + <!--This plugin's configuration is used to store Eclipse + m2e settings only. It has no influence on the Maven build itself. --> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.codehaus.mojo + </groupId> + <artifactId> + exec-maven-plugin + </artifactId> + <versionRange> + [1.4.0,) + </versionRange> + <goals> + <goal>exec</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml index 07c9ae203e..2375f8a072 100644 --- a/uitest-common/pom.xml +++ b/uitest-common/pom.xml @@ -1,110 +1,110 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-uitest-common</artifactId> - <name>vaadin-uitest-common</name> - <packaging>jar</packaging> - <properties> - <skip.uitest.deployment>true</skip.uitest.deployment> - </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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-uitest-common</artifactId> + <name>vaadin-uitest-common</name> + <packaging>jar</packaging> + <properties> + <skip.uitest.deployment>true</skip.uitest.deployment> + </properties> - <url>https://vaadin.com/</url> - <description>Vaadin UI test common classes and dependencies</description> + <url>https://vaadin.com/</url> + <description>Vaadin UI test common classes and dependencies</description> - <repositories> - <repository> - <id>vaadin-addons</id> - <url>http://maven.vaadin.com/vaadin-addons</url> - </repository> - </repositories> + <repositories> + <repository> + <id>vaadin-addons</id> + <url>http://maven.vaadin.com/vaadin-addons</url> + </repository> + </repositories> - <dependencies> - <!-- LIBRARY DEPENDENCIES (compile time) --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencies> + <!-- LIBRARY DEPENDENCIES (compile time) --> + <dependency> + <groupId>${project.groupId}</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>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-testbench</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-testbench</artifactId> + </dependency> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>${skip.uitest.deployment}</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>${skip.uitest.deployment}</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <configuration> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <!-- Profile used to deploy the uitest-common jar for testing --> - <id>dev-build</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <skip.uitest.deployment>false</skip.uitest.deployment> - </properties> - </profile> - </profiles> + <profiles> + <profile> + <!-- Profile used to deploy the uitest-common jar for testing --> + <id>dev-build</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <skip.uitest.deployment>false</skip.uitest.deployment> + </properties> + </profile> + </profiles> </project> diff --git a/uitest/pom.xml b/uitest/pom.xml index f7a571c324..afef955576 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -1,330 +1,330 @@ <?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>8.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-uitest</artifactId> - <name>vaadin-uitest</name> - <packaging>war</packaging> - <properties> - <skip.uitest.deployment>true</skip.uitest.deployment> - </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>8.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-uitest</artifactId> + <name>vaadin-uitest</name> + <packaging>war</packaging> + <properties> + <skip.uitest.deployment>true</skip.uitest.deployment> + </properties> - <url>https://vaadin.com/</url> - <description>Vaadin UI tests</description> + <url>https://vaadin.com/</url> + <description>Vaadin UI tests</description> - <repositories> - <repository> - <id>vaadin-addons</id> - <url>http://maven.vaadin.com/vaadin-addons</url> - </repository> - </repositories> + <repositories> + <repository> + <id>vaadin-addons</id> + <url>http://maven.vaadin.com/vaadin-addons</url> + </repository> + </repositories> - <dependencies> + <dependencies> - <!-- API DEPENDENCIES --> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <scope>provided</scope> - </dependency> + <!-- API DEPENDENCIES --> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - <!-- Google App Engine --> - <dependency> - <groupId>com.google.appengine</groupId> - <artifactId>appengine-api-1.0-sdk</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <!-- Google App Engine --> + <dependency> + <groupId>com.google.appengine</groupId> + <artifactId>appengine-api-1.0-sdk</artifactId> + <scope>provided</scope> + </dependency> - <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> - <!-- Jetty before vaadin-* on the classpath to make Eclipse use the right - version --> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-server</artifactId> - <scope>provided</scope> - </dependency> - <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> + <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> + <!-- Jetty before vaadin-* on the classpath to make Eclipse use the + right version --> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.websocket</groupId> + <artifactId>websocket-server</artifactId> + <scope>provided</scope> + </dependency> + <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> - <!-- LIBRARY DEPENDENCIES (compile time) --> - <!-- Project modules --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <!-- LIBRARY DEPENDENCIES (compile time) --> + <!-- Project modules --> + <dependency> + <groupId>${project.groupId}</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>${project.groupId}</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>${project.groupId}</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.google.gwt</groupId> - <artifactId>gwt-elemental</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-themes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-push</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client-compiled</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-themes</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-push</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> - <!-- Vaadin 7 components --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-client-compiled</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-server</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-compatibility-client</artifactId> - <version>${project.version}</version> - </dependency> - <!-- For compiling TestingWidgetSet --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-client-compiler</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> + <!-- Vaadin 7 components --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-client-compiled</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-compatibility-client</artifactId> + <version>${project.version}</version> + </dependency> + <!-- For compiling TestingWidgetSet --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-client-compiler</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <!-- Servlet API --> - <dependency> - <!-- Jetty requires 3.1.0 --> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - <scope>provided</scope> - </dependency> + <!-- Servlet API --> + <dependency> + <!-- Jetty requires 3.1.0 --> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1.0</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>vaadin-uitest-common</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>vaadin-uitest-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <!-- Mainly for SQLContainer tests --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </dependency> - <!-- This should be removed once tests have been updated to use lang3 --> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <!-- Mainly for SQLContainer tests --> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + <!-- This should be removed once tests have been updated to use lang3 --> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-sass-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <dependency> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-sass-compiler</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jgit</groupId> + <artifactId>org.eclipse.jgit</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> - <build> - <resources> - <resource> - <directory>src/main/themes</directory> - <excludes> - <exclude>**/*.scss</exclude> - </excludes> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> + <build> + <resources> + <resource> + <directory>src/main/themes</directory> + <excludes> + <exclude>**/*.scss</exclude> + </excludes> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> - <plugins> - <plugin> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-maven-plugin</artifactId> - <configuration> - <warSourceDirectory>src/main/themes</warSourceDirectory> - <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory> - <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir> - <checkAssertions>true</checkAssertions> - <extraJvmArgs>-Xmx1G</extraJvmArgs> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>compile-theme</goal> - </goals> - </execution> - </executions> - </plugin> + <plugins> + <plugin> + <groupId>com.vaadin</groupId> + <artifactId>vaadin-maven-plugin</artifactId> + <configuration> + <warSourceDirectory>src/main/themes</warSourceDirectory> + <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory> + <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir> + <checkAssertions>true</checkAssertions> + <extraJvmArgs>-Xmx1G</extraJvmArgs> + </configuration> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>compile-theme</goal> + </goals> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> - <configuration> - <httpConnector> - <port>8888</port> - </httpConnector> - </configuration> - </plugin> + <plugin> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.version}</version> + <configuration> + <httpConnector> + <port>8888</port> + </httpConnector> + </configuration> + </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>${skip.uitest.deployment}</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <configuration> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>${skip.uitest.deployment}</skip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <configuration> + <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> - <profiles> - <profile> - <!-- Profile used to deploy the uitest war for testing --> - <id>dev-build</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <skip.uitest.deployment>false</skip.uitest.deployment> - </properties> - </profile> - </profiles> + <profiles> + <profile> + <!-- Profile used to deploy the uitest war for testing --> + <id>dev-build</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <skip.uitest.deployment>false</skip.uitest.deployment> + </properties> + </profile> + </profiles> </project> diff --git a/widgets/pom.xml b/widgets/pom.xml index 772a97c6c2..4f8c2a8eca 100644 --- a/widgets/pom.xml +++ b/widgets/pom.xml @@ -1,6 +1,6 @@ <?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"> + 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> @@ -11,7 +11,7 @@ <name>vaadin-widgets</name> <packaging>jar</packaging> - <url>https://vaadin.com/</url> + <url>https://vaadin.com/</url> <description>Vaadin widgets</description> <dependencies> @@ -63,7 +63,7 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> + <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version> <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment> <!-- Export package is handled in exec plugin --> <Export-Package></Export-Package> @@ -231,7 +231,7 @@ <argument>-DincludeNumberPackages=1</argument> <argument>-classpath</argument> - <classpath/> + <classpath /> <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument> |