diff options
| -rw-r--r-- | client-compiler/pom.xml | 3 | ||||
| -rw-r--r-- | client/pom.xml | 3 | ||||
| -rw-r--r-- | pom.xml | 87 | ||||
| -rw-r--r-- | push/pom.xml | 366 | ||||
| -rw-r--r-- | server/pom.xml | 4 | ||||
| -rw-r--r-- | shared/pom.xml | 3 |
6 files changed, 249 insertions, 217 deletions
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml index a37155a738..3f79d36858 100644 --- a/client-compiler/pom.xml +++ b/client-compiler/pom.xml @@ -211,7 +211,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack-dependencies</id> @@ -304,7 +303,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -318,7 +316,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> </plugin> </plugins> </build> diff --git a/client/pom.xml b/client/pom.xml index 1d65a68487..dbfdea0455 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -98,7 +98,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack-dependencies</id> @@ -191,7 +190,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -210,7 +208,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> </plugin> </plugins> </build> @@ -13,6 +13,10 @@ <packaging>pom</packaging> <version>7.7.0-SNAPSHOT</version> + <prerequisites> + <maven>3.0.5</maven> + </prerequisites> + <properties> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> @@ -55,4 +59,87 @@ <module>client-compiler</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> + <version>2.7</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-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> + </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> + </project> diff --git a/push/pom.xml b/push/pom.xml index bfabb430de..35bfb27c6e 100644 --- a/push/pom.xml +++ b/push/pom.xml @@ -1,217 +1,175 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.vaadin</groupId> - <artifactId>vaadin-root</artifactId> - <version>7.7.0-SNAPSHOT</version> - </parent> - <artifactId>vaadin-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.0-SNAPSHOT</version> + </parent> + <artifactId>vaadin-push</artifactId> + <name>vaadin-push</name> + <packaging>jar</packaging> + <properties> - </properties> - - <organization> - <name>Vaadin Ltd</name> - </organization> - <url>https://vaadin.com/</url> - <description>Vaadin server push support</description> + </properties> - <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>jquery</artifactId> - <version>${atmosphere.js.version}</version> - <type>war</type> - <scope>provided</scope> - </dependency> + <organization> + <name>Vaadin Ltd</name> + </organization> + <url>https://vaadin.com/</url> + <description>Vaadin server push support</description> - </dependencies> + <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>jquery</artifactId> + <version>${atmosphere.js.version}</version> + <type>war</type> + <scope>provided</scope> + </dependency> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> - <executions> - <execution> - <id>default-cli</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <!-- <inherited>false</inherited> --> - <configuration> - <target> - <property name="jquery.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" /> + </dependencies> - <!-- Unzip to temp dir --> - <unzip - src="${maven.dependency.com.vaadin.external.atmosphere.client.jquery.war.path}" - dest="${jquery.unpack}"> - <patternset> - <include name="**/jquery.atmosphere.js" /> - </patternset> - <mapper type="flatten" /> - </unzip> - <loadfile srcfile="${templates.dir}/jquery-1.11.0.js" - property="jquery.js.contents" /> - <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js" - property="jquery.atmosphere.js.contents" /> + <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="jquery.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" /> - <loadfile srcfile="${templates.dir}/vaadinPush.js.tpl" - property="vaadinPush.js.contents"> - <filterchain> - <replacetokens begintoken="@" endtoken="@"> - <token key="jquery.js" value="${jquery.js.contents}" /> - <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" /> - </replacetokens> - </filterchain> - </loadfile> - <!-- Non-obfuscated version for debugging --> - <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo> + <!-- Unzip to temp dir --> + <unzip + src="${maven.dependency.com.vaadin.external.atmosphere.client.jquery.war.path}" + dest="${jquery.unpack}"> + <patternset> + <include name="**/jquery.atmosphere.js" /> + </patternset> + <mapper type="flatten" /> + </unzip> + <loadfile srcfile="${templates.dir}/jquery-1.11.0.js" + property="jquery.js.contents" /> + <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js" + property="jquery.atmosphere.js.contents" /> - </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> + <loadfile srcfile="${templates.dir}/vaadinPush.js.tpl" + property="vaadinPush.js.contents"> + <filterchain> + <replacetokens begintoken="@" endtoken="@"> + <token key="jquery.js" value="${jquery.js.contents}" /> + <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" /> + </replacetokens> + </filterchain> + </loadfile> + <!-- Non-obfuscated version for debugging --> + <echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> - <executions> - <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" /> + </target> + </configuration> + </execution> - <move file="${vaadinPush-min.js}" tofile="${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" /> - <!-- 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>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <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> - <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.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> + <move file="${vaadinPush-min.js}" tofile="${vaadinPush.js}" /> -</project>
\ No newline at end of file + <!-- 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>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <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> diff --git a/server/pom.xml b/server/pom.xml index 26bb2c53f5..722115d90b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -173,7 +173,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack-dependencies</id> @@ -228,7 +227,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> <executions> <execution> <id>compressbootstrap</id> @@ -289,7 +287,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -304,7 +301,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> </plugin> </plugins> </build> diff --git a/shared/pom.xml b/shared/pom.xml index cff92bf4a5..1825a6dfcf 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -82,7 +82,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> <executions> <execution> <id>unpack-dependencies</id> @@ -181,7 +180,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -196,7 +194,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> </plugin> </plugins> </build> |