diff options
| author | Julien Dramaix <julien.dramaix@gmail.com> | 2014-11-16 20:21:25 +0100 |
|---|---|---|
| committer | Julien Dramaix <julien.dramaix@gmail.com> | 2014-11-16 20:21:25 +0100 |
| commit | 221bb40ed0675d42d9dcd06bd84569a711a22799 (patch) | |
| tree | c2a8cc6d2e74140c6e8c0c077ce1510afb789ecb /gwtquery-core/pom.xml | |
| parent | c48182f905f31dc675c29ffb192db3152800c5d0 (diff) | |
| parent | e4f9cb55695ddb073d6faa4e48169a58db7c47d7 (diff) | |
| download | gwtquery-221bb40ed0675d42d9dcd06bd84569a711a22799.tar.gz gwtquery-221bb40ed0675d42d9dcd06bd84569a711a22799.zip | |
Merge pull request #300 from manolo/master
Replace org.json by elemental.json
Diffstat (limited to 'gwtquery-core/pom.xml')
| -rw-r--r-- | gwtquery-core/pom.xml | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index 2664df1b..67518e26 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -30,6 +30,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-elemental</artifactId> + <version>${gwtversion}</version> + </dependency> + <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <version>1.0.0.GA</version> @@ -42,13 +47,6 @@ <classifier>sources</classifier> <scope>provided</scope> </dependency> - <!-- needed in server side if we don't include gwt-servlet - we will remove this when using elemental.json or android.json --> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20140107</version> - </dependency> </dependencies> <build> <resources> @@ -58,6 +56,9 @@ <resource> <directory>${basedir}/src/main/super</directory> </resource> + <resource> + <directory>${project.build.directory}/generated-resources</directory> + </resource> </resources> <testResources> <testResource> @@ -100,8 +101,28 @@ <includes>**/GQueryGwtSuiteTest.java</includes> </configuration> </plugin> + <!-- We include elemental json implementation for JVM so as people + using GQuery json builders and ajax in server side don't have + to include that dependency --> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>unpack-dependencies</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <includeGroupIds>com.google.gwt</includeGroupIds> + <includeArtifactIds>gwt-elemental</includeArtifactIds> + <excludeTransitive>true</excludeTransitive> + <includes>elemental/json/**/*</includes> + <outputDirectory>${project.build.directory}/generated-resources</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - </project> |