]> source.dussan.org Git - vaadin-framework.git/commitdiff
Format project pom files using correct settings (4 spaces)
authorArtur Signell <artur@vaadin.com>
Fri, 23 Sep 2016 19:15:19 +0000 (22:15 +0300)
committerArtur Signell <artur@vaadin.com>
Sun, 25 Sep 2016 12:30:57 +0000 (15:30 +0300)
Change-Id: Ib8ae22a56334046effe721bb4d3769ef7b92d61d

12 files changed:
all/pom.xml
buildhelpers/pom.xml
client-compiled/pom.xml
client-compiler/pom.xml
client/pom.xml
liferay/pom.xml
pom.xml
push/pom.xml
shared/pom.xml
themes/pom.xml
uitest/pom.xml
widgets/pom.xml

index f378bd819a90c31154a8156f2936651ee9ce004d..4ce0a751f1e80f7113673223517657fbc08c24a0 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-SNAPSHOT</version>
-       </parent>
-       <artifactId>vaadin-all</artifactId>
-       <name>vaadin-all</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>7.7-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>
-               <relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.file>
-               <webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir>
-               <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
-       </properties>
+    <properties>
+        <relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file>
+        <relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.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>
+    <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>
+    <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-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-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-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</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-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-client-compiled</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>vaadin-widgets</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
+        <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>
+    <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>
+                <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" />
-                                                               <loadfile property="release-notes-authors" srcFile="${relnotes.authors.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}" />
-                                                                                       <token key="release-notes-authors" value="${release-notes-authors}" />
-                                                                               </replacetokens>
-                                                                       </filterchain>
-                                                               </copy>
-                                                       </target>
-                                               </configuration>
-                                       </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" />
+                                <loadfile property="release-notes-authors"
+                                    srcFile="${relnotes.authors.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}" />
+                                            <token
+                                                key="release-notes-authors"
+                                                value="${release-notes-authors}" />
+                                        </replacetokens>
+                                    </filterchain>
+                                </copy>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-                       <!-- vaadin-all zip -->
+            <!-- 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-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-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-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-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-source-plugin</artifactId>
+                    <configuration>
+                        <skipSource>true</skipSource>
+                    </configuration>
+                </plugin>
 
 
-                               <plugin>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <configuration>
-                                               <skip>true</skip>
-                                       </configuration>
-                               </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
 
-                       </plugins>
-               </pluginManagement>
-       </build>
+            </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 />
+    <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>
-                                                       <execution>
-                                                               <id>fetch-release-notes-authors</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>
+                            <execution>
+                                <id>fetch-release-notes-authors</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.FetchReleaseNotesAuthors
-                                                                               </argument>
-                                                                       </arguments>
-                                                                       <outputFile>${relnotes.authors.file}</outputFile>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
+                                        <argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors
+                                        </argument>
+                                    </arguments>
+                                    <outputFile>${relnotes.authors.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>
+                    <!-- 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-server</artifactId>
+                                            <classifier>sources</classifier>
+                                        </artifactItem>
 
-                                                                               <artifactItem>
-                                                                                       <groupId>${project.groupId}</groupId>
-                                                                                       <artifactId>vaadin-client</artifactId>
-                                                                                       <classifier>sources</classifier>
-                                                                               </artifactItem>
-                                                                       </artifactItems>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
+                                        <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>
+                    <!-- 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>
+                    <!-- 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>
index 03eff48bb1c1e5105a4f7bfc2e166299e655a54d..69dc51c60fa992da8cbab2f91d9093db5a6c5cc2 100644 (file)
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-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>7.7-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>
-                       <version>${commons-io.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-cli</groupId>
-                       <artifactId>commons-cli</artifactId>
-                       <version>1.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-sass-compiler</artifactId>
-                       <version>${vaadin.sass.version}</version>
-               </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</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>
-       </dependencies>
+        <dependency>
+            <groupId>com.carrotsearch</groupId>
+            <artifactId>smartsprites</artifactId>
+            <version>0.2.10</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>
-                       <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>
index 5200e9c9fc9c3a7183904d3a32b638e02979ad9a..7405c4455dc6519894d05d2ea990c695fd4e72d1 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-SNAPSHOT</version>
-       </parent>
-       <groupId>com.vaadin</groupId>
-       <artifactId>vaadin-client-compiled</artifactId>
-       <name>vaadin-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>7.7-SNAPSHOT</version>
+    </parent>
+    <groupId>com.vaadin</groupId>
+    <artifactId>vaadin-client-compiled</artifactId>
+    <name>vaadin-client-compiled</name>
+    <packaging>jar</packaging>
 
-       <properties>
-               <widgetset.name>com.vaadin.DefaultWidgetSet</widgetset.name>
-               <widgetset.style>OBF</widgetset.style>
-               <widgetset.local.workers>6</widgetset.local.workers>
-       </properties>
+    <properties>
+        <widgetset.name>com.vaadin.DefaultWidgetSet</widgetset.name>
+        <widgetset.style>OBF</widgetset.style>
+        <widgetset.local.workers>6</widgetset.local.workers>
+    </properties>
 
-       <url>https://vaadin.com/</url>
-       <description>Vaadin client compiled</description>
+    <url>https://vaadin.com/</url>
+    <description>Vaadin client compiled</description>
 
-       <dependencies>
-               <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>
 
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>vaadin-client</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>vaadin-client-compiler</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-client-compiler</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>
+        <dependency>
+            <groupId>${project.groupId}</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>com.vaadin.DefaultWidgetSet</module>
-                                       </modules>
-                                       <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
-                                       <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
-                                       <style>${widgetset.style}</style>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>compile</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+            <plugin>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-maven-plugin</artifactId>
+                <configuration>
+                    <modules>
+                        <module>com.vaadin.DefaultWidgetSet</module>
+                    </modules>
+                    <webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+                    <persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+                    <style>${widgetset.style}</style>
+                </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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                                               <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>
index c6296418b5683a1715032fa095d71560957814aa..0aac82a2a233fec3903fe7aa1d5b8d9cd78460ec 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-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>7.7-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>com.vaadin</groupId>
-                       <artifactId>vaadin-client</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin.external.gwt</groupId>
-                       <artifactId>gwt-dev</artifactId>
-                       <version>${vaadin.gwt.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-sass-compiler</artifactId>
-                       <version>${vaadin.sass.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin.external.gwt</groupId>
+            <artifactId>gwt-dev</artifactId>
+            <version>${vaadin.gwt.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-sass-compiler</artifactId>
+            <version>${vaadin.sass.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                                               <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-                                               <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>
index 26e3f85df450810a92e99634283b3f105f34ddb4..bdc7644344204e19b3e0eaf8f45ea3291272f126 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-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>7.7-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>com.vaadin</groupId>
-                       <artifactId>vaadin-shared</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
+    <dependencies>
+        <!-- LIBRARY DEPENDENCIES (compile time) -->
+        <!-- Project modules -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-shared</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-server</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>com.vaadin</groupId>
-                                       <artifactId>vaadin-sass-compiler</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin</groupId>
+                    <artifactId>vaadin-sass-compiler</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-               <!-- Testing dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
+        <!-- Testing dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.easymock</groupId>
-                       <artifactId>easymock</artifactId>
-                       <version>3.0</version>
-                       <scope>test</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.0</version>
+            <scope>test</scope>
+        </dependency>
 
-               <!-- Needed GWT dependencies, includes gwt-user -->
-               <dependency>
-                       <groupId>com.vaadin.external.gwt</groupId>
-                       <artifactId>gwt-elemental</artifactId>
-                       <version>${vaadin.gwt.version}</version>
-               </dependency>
-       </dependencies>
+        <!-- Needed GWT dependencies, includes gwt-user -->
+        <dependency>
+            <groupId>com.vaadin.external.gwt</groupId>
+            <artifactId>gwt-elemental</artifactId>
+            <version>${vaadin.gwt.version}</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>
+    <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>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-                                               <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>
index 001459e5597cf91363e9e7e3cbb453bffc28655c..0c8457eb6219ccdb70ef33d7838c51538ab45b95 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-SNAPSHOT</version>
-       </parent>
-       <artifactId>vaadin-liferay</artifactId>
-       <name>vaadin-liferay</name>
-       <packaging>pom</packaging>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-root</artifactId>
+        <version>7.7-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/liferay/**,
-                                                                               VAADIN/themes/runo/**,
-                                                                               VAADIN/themes/reindeer/**
-                                                                       </includes>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       <groupId>com.vaadin</groupId>
-                                                                       <artifactId>vaadin-server</artifactId>
-                                                                       <includes>VAADIN/vaadinBootstrap.js</includes>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <archive>
-                                               <addMavenDescriptor>false</addMavenDescriptor>
-                                       </archive>
-                                       <appendAssemblyId>false</appendAssemblyId>
-                                       <descriptors>
-                                               <descriptor>liferay-assembly-descriptor.xml</descriptor>
-                                       </descriptors>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-deploy-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-install-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-               </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.sonatype.plugins</groupId>
-                                       <artifactId>nexus-staging-maven-plugin</artifactId>
-                                       <configuration>
-                                               <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/liferay/**,
+                                        VAADIN/themes/runo/**,
+                                        VAADIN/themes/reindeer/**
+                                    </includes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.vaadin</groupId>
+                                    <artifactId>vaadin-server</artifactId>
+                                    <includes>VAADIN/vaadinBootstrap.js</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>liferay-assembly-descriptor.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <configuration>
+                        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 615205312038ffd93ea10189b2140c19fa65095f..b2bea62ac3e52c542ce1860b27bdb029e7ac9cc1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
 <?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>
-       <groupId>com.vaadin</groupId>
-       <artifactId>vaadin-root</artifactId>
-       <name>vaadin-root</name>
-       <packaging>pom</packaging>
-       <version>7.7-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>
+    <groupId>com.vaadin</groupId>
+    <artifactId>vaadin-root</artifactId>
+    <name>vaadin-root</name>
+    <packaging>pom</packaging>
+    <version>7.7-SNAPSHOT</version>
 
-       <prerequisites>
-               <maven>3.0.5</maven>
-       </prerequisites>
+    <prerequisites>
+        <maven>3.0.5</maven>
+    </prerequisites>
 
-       <properties>
-               <maven.compiler.source>1.6</maven.compiler.source>
-               <maven.compiler.target>1.6</maven.compiler.target>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <properties>
+        <maven.compiler.source>1.6</maven.compiler.source>
+        <maven.compiler.target>1.6</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-               <!-- Used version numbers for dependencies -->
-               <commons-io.version>2.4</commons-io.version>
-               <google.appengine.version>1.7.7</google.appengine.version>
-               <jsoup.version>1.8.3</jsoup.version>
-               <liferay.portal.version>6.0.2</liferay.portal.version>
+        <!-- Used version numbers for dependencies -->
+        <commons-io.version>2.4</commons-io.version>
+        <google.appengine.version>1.7.7</google.appengine.version>
+        <jsoup.version>1.8.3</jsoup.version>
+        <liferay.portal.version>6.0.2</liferay.portal.version>
 
-               <vaadin.sass.version>0.9.13</vaadin.sass.version>
-               <vaadin.gwt.version>2.7.0.vaadin4</vaadin.gwt.version>
-               <vaadin.plugin.version>7.7.0</vaadin.plugin.version>
+        <vaadin.sass.version>0.9.13</vaadin.sass.version>
+        <vaadin.gwt.version>2.7.0.vaadin4</vaadin.gwt.version>
+        <vaadin.plugin.version>7.7.0</vaadin.plugin.version>
 
-               <javax.portlet.version>2.0</javax.portlet.version>
-               <javax.servlet.version>3.0.1</javax.servlet.version>
-               <javax.validation.version>1.0.0.GA</javax.validation.version>
+        <javax.portlet.version>2.0</javax.portlet.version>
+        <javax.servlet.version>3.0.1</javax.servlet.version>
+        <javax.validation.version>1.0.0.GA</javax.validation.version>
 
-               <!-- Test dependencies -->
-               <junit.version>4.11</junit.version>
+        <!-- Test dependencies -->
+        <junit.version>4.11</junit.version>
 
-               <!-- Atmosphere versions -->
-               <!-- Note that this should be kept in sync with the class Constants -->
-               <atmosphere.runtime.version>2.2.9.vaadin2</atmosphere.runtime.version>
-               <atmosphere.js.version>2.2.13.vaadin5</atmosphere.js.version>
+        <!-- Atmosphere versions -->
+        <!-- Note that this should be kept in sync with the class Constants -->
+        <atmosphere.runtime.version>2.2.9.vaadin2</atmosphere.runtime.version>
+        <atmosphere.js.version>2.2.13.vaadin5</atmosphere.js.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>
-       </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>
+    </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</module>
-               <module>liferay</module>
-               <module>all</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</module>
+        <module>liferay</module>
+        <module>all</module>
+        <!-- Nexus staging bug needs the last module to be deployed. -->
+        <module>bom</module>
+    </modules>
 
-       <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>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>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>build-helper-maven-plugin</artifactId>
-                           <version>1.8</version>
-                           <executions>
-                             <execution>
-                               <id>parse-version</id>
-                               <goals>
-                                 <goal>parse-version</goal>
-                               </goals>
-                             </execution>
-                           </executions>
-                       </plugin>               
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>animal-sniffer-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>java6compatibility</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>check</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <signature>
-                                                               <groupId>org.codehaus.mojo.signature</groupId>
-                                                               <artifactId>java16</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>build-helper-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>parse-version</id>
+                        <goals>
+                            <goal>parse-version</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>java6compatibility</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature</groupId>
+                                <artifactId>java16</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>
-                               </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>
+                </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>
index f87c597c54db123ae56351b5c54e00afee1c4ad5..d8907902db28a4c05005f683b991f316e371153a 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-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>7.7-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>
-                       <version>${atmosphere.runtime.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin.external.atmosphere.client</groupId>
-                       <artifactId>javascript</artifactId>
-                       <version>${atmosphere.js.version}</version>
-                       <type>war</type>
-                       <scope>provided</scope>
-               </dependency>
+    <dependencies>
+        <!-- Atmosphere -->
+        <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>
+            <version>${atmosphere.js.version}</version>
+            <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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                                               <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>
index c4cfed3844c82933b8dee5cda6db94b98535373e..c374c272b0f831afbeb3bb9a8b3b62e860289265 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-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>7.7-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.vaadin.external.gwt</groupId>
-                       <artifactId>gwt-elemental</artifactId>
-                       <version>${vaadin.gwt.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+    <dependencies>
+        <!-- Needed GWT dependencies. Required parts are packaged to jar -->
+        <dependency>
+            <groupId>com.vaadin.external.gwt</groupId>
+            <artifactId>gwt-elemental</artifactId>
+            <version>${vaadin.gwt.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</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.vaadin.external.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.vaadin.external.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>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-                                               <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                                               <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",elemental.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+                        <Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",elemental.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</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>
index cba14677cf6e940f6c406efd05bdf1d417cf9f44..2976f4848ea9ad5a9e448a047a6a4c7e43ddd0b1 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-SNAPSHOT</version>
-       </parent>
-       <groupId>com.vaadin</groupId>
-       <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>7.7-SNAPSHOT</version>
+    </parent>
+    <groupId>com.vaadin</groupId>
+    <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>
-                       <version>${vaadin.sass.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-sass-compiler</artifactId>
+            <version>${vaadin.sass.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <!-- remove cssparser override once sass-compiler is updated -->
-               <dependency>
-                       <groupId>net.sourceforge.cssparser</groupId>
-                       <artifactId>cssparser</artifactId>
-                       <version>0.9.11</version>
-                       <scope>provided</scope>
-               </dependency>
+        <!-- remove cssparser override once sass-compiler is updated -->
+        <dependency>
+            <groupId>net.sourceforge.cssparser</groupId>
+            <artifactId>cssparser</artifactId>
+            <version>0.9.11</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.carrotsearch</groupId>
-                       <artifactId>smartsprites</artifactId>
-                       <version>0.2.10</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>com.carrotsearch</groupId>
+            <artifactId>smartsprites</artifactId>
+            <version>0.2.10</version>
+            <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-liferay</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-liferay</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/liferay/legacy-styles.scss</argument>
-                                                               <argument> ${project.build.outputDirectory}/VAADIN/themes/liferay/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/liferay/legacy-styles.scss</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/liferay/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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
-                                               <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</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>
index 791cd7c2b17ca2bf04e2cef1f69e699ccb0e0383..cffa431dca51bf1f19ae58fdcaff290c08b877cf 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>com.vaadin</groupId>
-               <artifactId>vaadin-root</artifactId>
-               <version>7.7-SNAPSHOT</version>
-       </parent>
-       <artifactId>vaadin-uitest</artifactId>
-       <name>vaadin-uitest</name>
-       <packaging>war</packaging>
-       <properties>
-               <jetty.version>9.3.9.v20160517</jetty.version>
-               <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>7.7-SNAPSHOT</version>
+    </parent>
+    <artifactId>vaadin-uitest</artifactId>
+    <name>vaadin-uitest</name>
+    <packaging>war</packaging>
+    <properties>
+        <jetty.version>9.3.9.v20160517</jetty.version>
+        <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>
-                       <version>2.0</version>
-                       <scope>provided</scope>
-               </dependency>
+        <!-- API DEPENDENCIES -->
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <dependency>
-                       <groupId>javax.validation</groupId>
-                       <artifactId>validation-api</artifactId>
-                       <version>1.0.0.GA</version>
-               </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.0.0.GA</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-validator</artifactId>
-                       <version>4.2.0.Final</version>
-               </dependency>
-               <!-- Google App Engine -->
-               <dependency>
-                       <groupId>com.google.appengine</groupId>
-                       <artifactId>appengine-api-1.0-sdk</artifactId>
-                       <version>1.7.7</version>
-                       <scope>provided</scope>
-               </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>4.2.0.Final</version>
+        </dependency>
+        <!-- Google App Engine -->
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>1.7.7</version>
+            <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>
-                       <version>${jetty.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.jetty</groupId>
-                       <artifactId>jetty-servlets</artifactId>
-                       <version>${jetty.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.jetty.websocket</groupId>
-                       <artifactId>websocket-server</artifactId>
-                       <version>${jetty.version}</version>
-                       <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>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlets</artifactId>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-server</artifactId>
+            <version>${jetty.version}</version>
+            <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>com.vaadin</groupId>
-                       <artifactId>vaadin-server</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.servlet</groupId>
-                                       <artifactId>javax.servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <!-- LIBRARY DEPENDENCIES (compile time) -->
+        <!-- Project modules -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-client</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.validation</groupId>
-                                       <artifactId>javax.servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.vaadin.external.gwt</groupId>
-                       <artifactId>gwt-elemental</artifactId>
-                       <version>${vaadin.gwt.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin.external.gwt</groupId>
-                       <artifactId>gwt-servlet</artifactId>
-                       <version>${vaadin.gwt.version}</version>
-               </dependency>
+        <dependency>
+            <groupId>com.vaadin.external.gwt</groupId>
+            <artifactId>gwt-elemental</artifactId>
+            <version>${vaadin.gwt.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin.external.gwt</groupId>
+            <artifactId>gwt-servlet</artifactId>
+            <version>${vaadin.gwt.version}</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-client-compiled</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-themes</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-push</artifactId>
-                       <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>javax.validation</groupId>
-                                       <artifactId>javax.servlet-api</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiled</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-themes</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-push</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.validation</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-               <!-- For compiling TestingWidgetSet -->
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-client-compiler</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
+        <!-- For compiling TestingWidgetSet -->
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiler</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
-               <!-- Servlet 3.0 API -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.0</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-all</artifactId>
-                       <version>1.3</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.jcraft</groupId>
-                       <artifactId>jsch</artifactId>
-                       <version>0.1.52</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <version>1.5</version>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>${commons-io.version}</version>
-               </dependency>
-               <!-- Mainly for SQLContainer tests -->
-               <dependency>
-                       <groupId>org.hsqldb</groupId>
-                       <artifactId>hsqldb</artifactId>
-                       <version>2.2.6</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-testbench</artifactId>
-                       <version>4.0.3</version>
-                       <scope>test</scope>
-               </dependency>
-               <!-- This should be removed once tests have been updated to use lang3 -->
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <version>2.6</version>
-               </dependency>
+        <!-- Servlet 3.0 API -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.52</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+        <!-- Mainly for SQLContainer tests -->
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-testbench</artifactId>
+            <version>4.0.3</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- This should be removed once tests have been updated to use lang3 -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
 
-               <dependency>
-                       <groupId>com.vaadin</groupId>
-                       <artifactId>vaadin-sass-compiler</artifactId>
-                       <version>${vaadin.sass.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.jgit</groupId>
-                       <artifactId>org.eclipse.jgit</artifactId>
-                       <version>3.5.1.201410131835-r</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.apache.httpcomponents</groupId>
-                                       <artifactId>httpclient</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-sass-compiler</artifactId>
+            <version>${vaadin.sass.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>3.5.1.201410131835-r</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 
-       <build>
-               <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>
-                               </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>
+                </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>
index 21cf89143076e9f8bfb594b4a129c5d6f0d7ceb4..2c18c62e7e937a4c0c637d7af04a9919bb0c9bfd 100644 (file)
@@ -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>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
                         <!-- Export package is handled in exec plugin -->
                         <Export-Package></Export-Package>
                                 <argument>-DincludeNumberPackages=1</argument>
 
                                 <argument>-classpath</argument>
-                                <classpath/>
+                                <classpath />
 
                                 <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>