diff options
-rw-r--r-- | gwtquery-core/pom.xml | 21 | ||||
-rw-r--r-- | pom.xml | 71 | ||||
-rw-r--r-- | samples/pom.xml | 6 |
3 files changed, 19 insertions, 79 deletions
diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index 8052f6cb..4b1af9e9 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -18,25 +18,18 @@ <artifactId>junit</artifactId> <version>3.8.1</version> <type>jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> <version>${gwtversion}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-dev</artifactId> <version>${gwtversion}</version> - <classifier>${gwtplatform}-libs</classifier> - <type>zip</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwtversion}</version> - <classifier>${gwtplatform}</classifier> <scope>provided</scope> </dependency> </dependencies> @@ -56,7 +49,6 @@ <testResource> <directory>${basedir}/src/test/resources</directory> </testResource> - </testResources> <plugins> @@ -89,29 +81,22 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.4.3</version> <configuration> - <skipTests>true</skipTests> + <skipTests>false</skipTests> <additionalClasspathElements> - <additionalClasspathElement> ${project.build.sourceDirectory} </additionalClasspathElement> - <additionalClasspathElement> ${project.build.testSourceDirectory} </additionalClasspathElement> </additionalClasspathElements> - - <useSystemClassLoader>true</useSystemClassLoader> - <useManifestOnlyJar>false</useManifestOnlyJar> - <forkMode>always</forkMode> <systemProperties> <property> <name>gwt.args</name> <value>-out target/www</value> </property> </systemProperties> - <argLine>-Xmx1024m</argLine> </configuration> </plugin> </plugins> @@ -26,6 +26,15 @@ <organization>Timefire.com</organization> <timezone>-8</timezone> </developer> + <developer> + <id>manolo</id> + <name>Manuel Carrasco MoƱino</name> + <email>manolo@apache.org</email> + <organization>ASF</organization> + <roles> + <role>Developer</role> + </roles> + </developer> </developers> <scm> @@ -99,19 +108,8 @@ </plugins> </reporting> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </pluginRepository> - </pluginRepositories> - <repositories> <repository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </repository> - <repository> <id>timepedia</id> <url>http://gwt-chronoscope.googlecode.com/svn/mavenrepo/</url> </repository> @@ -130,60 +128,17 @@ </activation> <properties> - <gwtversion>1.7.0</gwtversion> + <gwtversion>2.0.3</gwtversion> <gwt.loglevel>INFO</gwt.loglevel> <gwt.outputstyle>PRETTY</gwt.outputstyle> <gwt.modulesuffix></gwt.modulesuffix> - <!-- <maven.test.skip>true</maven.test.skip> --> - </properties> - </profile> - - - <profile> - <id>linux</id> - <activation> - <os> - <name>linux</name> - </os> - </activation> - <properties> - <gwtplatform>linux</gwtplatform> - <google.webtoolkit.extrajvmargs>-Xmx512m - </google.webtoolkit.extrajvmargs> - - </properties> - </profile> - - <profile> - <id>windows</id> - <activation> - <os> - <family>windows</family> - </os> - </activation> - <properties> - <gwtplatform>windows</gwtplatform> - <google.webtoolkit.extrajvmargs>-Xmx512m - </google.webtoolkit.extrajvmargs> </properties> </profile> <profile> - <id>macosx</id> - <activation> - <os> - <name>mac os x</name> - </os> - </activation> - <properties> - <gwtplatform>mac</gwtplatform> - <google.webtoolkit.extrajvmargs>-Xmx512m -XstartOnFirstThread - </google.webtoolkit.extrajvmargs> - </properties> - </profile> - <profile> <id>dev</id> <properties> + <gwtversion>2.0.3</gwtversion> <gwt.loglevel>WARN</gwt.loglevel> <gwt.modulesuffix>Dev</gwt.modulesuffix> <gwt.outputstyle>PRETTY</gwt.outputstyle> @@ -193,14 +148,12 @@ <profile> <id>prod</id> <properties> - <gwtversion>1.7.0</gwtversion> + <gwtversion>2.0.3</gwtversion> <gwt.loglevel>ERROR</gwt.loglevel> <gwt.outputstyle>OBF</gwt.outputstyle> <gwt.modulesuffix></gwt.modulesuffix> - <!-- <maven.test.skip>true</maven.test.skip> --> </properties> </profile> - </profiles> </project> diff --git a/samples/pom.xml b/samples/pom.xml index e0c94656..18af3fa7 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -10,13 +10,14 @@ <name>GwtQuery Samples</name> <artifactId>gwtquery-samples</artifactId> - <packaging>jar</packaging> + <packaging>war</packaging> <dependencies> <dependency> <groupId>${groupId}</groupId> <artifactId>gwtquery</artifactId> <version>${version}</version> <type>jar</type> + <scope>provided</scope> </dependency> <dependency> @@ -24,6 +25,7 @@ <artifactId>gwtquery-plugins</artifactId> <version>${version}</version> <type>jar</type> + <scope>provided</scope> </dependency> </dependencies> <build> @@ -31,7 +33,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>1.1</version> <configuration> <logLevel>${gwt.loglevel}</logLevel> <style>${gwt.outputstyle}</style> @@ -59,6 +60,7 @@ </configuration> <executions> <execution> + <phase>prepare-package</phase> <goals> <goal>compile</goal> </goals> |