summaryrefslogtreecommitdiffstats
path: root/push
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-09-09 13:11:17 +0300
committerHenri Sara <hesara@vaadin.com>2016-09-09 10:32:17 +0000
commit61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab (patch)
treeac3af735a6e7281f7110bd793c996587f597e8dd /push
parente5dece5b6e6c53b61f4c10ba9427548659dc5424 (diff)
downloadvaadin-framework-61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab.tar.gz
vaadin-framework-61aff6078ce7fda5aba4c423ae6f78c4e3fd8cab.zip
Format project pom files using correct settings (4 spaces)
Change-Id: I4b4760949897d2755da26a06f9048a596abdf0b6
Diffstat (limited to 'push')
-rw-r--r--push/pom.xml310
1 files changed, 159 insertions, 151 deletions
diff --git a/push/pom.xml b/push/pom.xml
index 71ecbad0cd..f0ad9d7e39 100644
--- a/push/pom.xml
+++ b/push/pom.xml
@@ -1,168 +1,176 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-root</artifactId>
- <version>8.0-SNAPSHOT</version>
- </parent>
- <artifactId>vaadin-push</artifactId>
- <name>vaadin-push</name>
- <packaging>jar</packaging>
- <properties>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.vaadin</groupId>
+ <artifactId>vaadin-root</artifactId>
+ <version>8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>vaadin-push</artifactId>
+ <name>vaadin-push</name>
+ <packaging>jar</packaging>
+ <properties>
- </properties>
+ </properties>
- <url>https://vaadin.com/</url>
- <description>Vaadin server push support</description>
+ <url>https://vaadin.com/</url>
+ <description>Vaadin server push support</description>
- <dependencies>
- <!-- Atmosphere -->
- <dependency>
- <groupId>com.vaadin.external.atmosphere</groupId>
- <artifactId>atmosphere-runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>com.vaadin.external.atmosphere.client</groupId>
- <artifactId>javascript</artifactId>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <!-- Atmosphere -->
+ <dependency>
+ <groupId>com.vaadin.external.atmosphere</groupId>
+ <artifactId>atmosphere-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.vaadin.external.atmosphere.client</groupId>
+ <artifactId>javascript</artifactId>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <!-- <inherited>false</inherited> -->
- <configuration>
- <target>
- <property name="javascript.unpack" location="${project.build.directory}/temp" />
- <property name="vaadinPush.js"
- location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
- <property name="templates.dir"
- location="${project.build.sourceDirectory}/../templates" />
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-cli</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <!-- <inherited>false</inherited> -->
+ <configuration>
+ <target>
+ <property name="javascript.unpack"
+ location="${project.build.directory}/temp" />
+ <property name="vaadinPush.js"
+ location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
+ <property name="templates.dir"
+ location="${project.build.sourceDirectory}/../templates" />
- <!-- Unzip to temp dir -->
- <unzip
- src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}"
- dest="${javascript.unpack}">
- <patternset>
- <include name="**/atmosphere.js" />
- </patternset>
- <mapper type="flatten" />
- </unzip>
- <loadfile srcfile="${javascript.unpack}/atmosphere.js"
- property="atmosphere.js.contents" />
+ <!-- Unzip to temp dir -->
+ <unzip
+ src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}"
+ dest="${javascript.unpack}">
+ <patternset>
+ <include name="**/atmosphere.js" />
+ </patternset>
+ <mapper type="flatten" />
+ </unzip>
+ <loadfile
+ srcfile="${javascript.unpack}/atmosphere.js"
+ property="atmosphere.js.contents" />
- <loadfile srcfile="${templates.dir}/vaadinPush.js.tpl"
- property="vaadinPush.js.contents">
- <filterchain>
- <replacetokens begintoken="@" endtoken="@">
- <token key="atmosphere.js" value="${atmosphere.js.contents}" />
- </replacetokens>
- </filterchain>
- </loadfile>
- <!-- Non-obfuscated version for debugging -->
- <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo>
+ <loadfile
+ srcfile="${templates.dir}/vaadinPush.js.tpl"
+ property="vaadinPush.js.contents">
+ <filterchain>
+ <replacetokens
+ begintoken="@" endtoken="@">
+ <token key="atmosphere.js"
+ value="${atmosphere.js.contents}" />
+ </replacetokens>
+ </filterchain>
+ </loadfile>
+ <!-- Non-obfuscated version for debugging -->
+ <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo>
- </target>
- </configuration>
- </execution>
+ </target>
+ </configuration>
+ </execution>
- <execution>
- <id>compresspush</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <property name="vaadinPush.debug.js"
- location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
- <property name="vaadinPush-min.js"
- location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug-min.js" />
- <property name="vaadinPush.js"
- location="${project.build.outputDirectory}/VAADIN/vaadinPush.js" />
+ <execution>
+ <id>compresspush</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <property name="vaadinPush.debug.js"
+ location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
+ <property name="vaadinPush-min.js"
+ location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug-min.js" />
+ <property name="vaadinPush.js"
+ location="${project.build.outputDirectory}/VAADIN/vaadinPush.js" />
- <move file="${vaadinPush-min.js}" tofile="${vaadinPush.js}" />
+ <move file="${vaadinPush-min.js}"
+ tofile="${vaadinPush.js}" />
- <!-- Gzipped versions -->
- <gzip src="${vaadinPush.debug.js}" destfile="${vaadinPush.debug.js}.gz" />
- <gzip src="${vaadinPush.js}" destfile="${vaadinPush.js}.gz" />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- Gzipped versions -->
+ <gzip src="${vaadinPush.debug.js}"
+ destfile="${vaadinPush.debug.js}.gz" />
+ <gzip src="${vaadinPush.js}"
+ destfile="${vaadinPush.js}.gz" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.5.1</version>
- <executions>
- <execution>
- <id>minifyjs</id>
- <phase>process-resources</phase>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sourceDirectory>${project.build.outputDirectory}/VAADIN</sourceDirectory>
- <includes>
- <include>vaadinPush.debug.js</include>
- </includes>
- <outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>1.5.1</version>
+ <executions>
+ <execution>
+ <id>minifyjs</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>${project.build.outputDirectory}/VAADIN</sourceDirectory>
+ <includes>
+ <include>vaadinPush.debug.js</include>
+ </includes>
+ <outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
- <Export-Package>VAADIN</Export-Package>
- <Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <index>false</index>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+ <Export-Package>VAADIN</Export-Package>
+ <Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <index>false</index>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>