Skip to content

Commit

Permalink
Update pom structure & versions
Browse files Browse the repository at this point in the history
  • Loading branch information
PierreH committed Oct 26, 2012
1 parent 7d87011 commit c463e71
Show file tree
Hide file tree
Showing 14 changed files with 182 additions and 157 deletions.
20 changes: 14 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,20 @@ nbproject
target
test-output
nbactions.xml
gwt/samples/gwt-demo/src/main/webapp/WEB-INF/classes/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/classes/
gwt/samples/gwt-conn-share/src/main/webapp/WEB-INF/classes/
atlassian-ide-plugin.xml

gwt/samples/gwt-conn-share/src/main/gwt-unitCache/
gwt/samples/gwt-conn-share/src/main/webapp/gwtDemo/
gwt/samples/gwt-conn-share/src/main/webapp/WEB-INF/classes/
gwt/samples/gwt-conn-share/src/main/webapp/WEB-INF/deploy/
gwt/samples/gwt-conn-share/src/main/webapp/WEB-INF/lib/
gwt/samples/gwt-chat/src/main/gwt-unitCache/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/deploy/gwtDemo/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/lib/
gwt/samples/gwt-chat/src/main/webapp/gwtDemo/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/classes/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/deploy/
gwt/samples/gwt-chat/src/main/webapp/WEB-INF/lib/
gwt/samples/gwt-demo/src/main/gwt-unitCache/
gwt/samples/gwt-demo/src/main/webapp/gwtDemo/
gwt/samples/gwt-demo/src/main/webapp/WEB-INF/classes/
gwt/samples/gwt-demo/src/main/webapp/WEB-INF/deploy/
gwt/samples/gwt-demo/src/main/webapp/WEB-INF/lib/

2 changes: 1 addition & 1 deletion gwt/modules/atmosphere-gwt-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gwt/modules/atmosphere-gwt-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand Down
4 changes: 1 addition & 3 deletions gwt/modules/atmosphere-gwt-extra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand Down Expand Up @@ -40,8 +40,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>gwtprojsonserializer</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
4 changes: 1 addition & 3 deletions gwt/modules/atmosphere-gwt-jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-jackson</artifactId>
Expand Down Expand Up @@ -32,8 +32,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
4 changes: 1 addition & 3 deletions gwt/modules/atmosphere-gwt-js/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand Down Expand Up @@ -98,8 +98,6 @@
<dependency>
<groupId>org.timepedia.exporter</groupId>
<artifactId>gwtexporter</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
4 changes: 1 addition & 3 deletions gwt/modules/atmosphere-gwt-poll/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand Down Expand Up @@ -32,7 +32,6 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwt-version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
Expand All @@ -41,7 +40,6 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
5 changes: 1 addition & 4 deletions gwt/modules/atmosphere-gwt-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
Expand All @@ -26,13 +26,10 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
Expand Down
124 changes: 23 additions & 101 deletions gwt/modules/pom.xml
Original file line number Diff line number Diff line change
@@ -1,109 +1,31 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<!-- synced to revision 144 of gwt-comet -->

<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-project</artifactId>
<version>1.1.1-SNAPSHOT</version>
</parent>
<!-- synced to revision 144 of gwt-comet -->

<parent>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<packaging>pom</packaging>
<name>atmosphere-gwt</name>

<description>A fork of gwt-comet project to integrate with Atmosphere</description>

<modules>
<!-- not needed any as of 2.3.0 <module>gwt-exporter</module> -->
<module>atmosphere-gwt-client</module>
<module>atmosphere-gwt-extra</module>
<module>atmosphere-gwt-common</module>
<module>atmosphere-gwt-js</module>
<module>atmosphere-gwt-poll</module>
<module>atmosphere-gwt-server</module>
<module>atmosphere-gwt-jackson</module>
<artifactId>atmosphere-gwt-project</artifactId>
<version>1.1.0-SNAPSHOT</version>
</parent>

<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt</artifactId>
<packaging>pom</packaging>
<name>atmosphere-gwt</name>

<description>A fork of gwt-comet project to integrate with Atmosphere</description>

<modules>
<!-- not needed any as of 2.3.0 <module>gwt-exporter</module> -->
<module>atmosphere-gwt-client</module>
<module>atmosphere-gwt-extra</module>
<module>atmosphere-gwt-common</module>
<module>atmosphere-gwt-js</module>
<module>atmosphere-gwt-poll</module>
<module>atmosphere-gwt-server</module>
<module>atmosphere-gwt-jackson</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<extensions>
<extension>
<groupId>org.jvnet.wagon-svn</groupId>
<artifactId>wagon-svn</artifactId>
<version>1.9</version>
</extension>
</extensions>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-common</artifactId>
<version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-client</artifactId>
<version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-extra</artifactId>
<version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-gwt-server</artifactId>
<version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwt-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<version>${gwt-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${gwt-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-runtime</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
Loading

0 comments on commit c463e71

Please sign in to comment.