Skip to content

Commit facd901

Browse files
author
Mathieu Carbou
committed
Maven config changes
1 parent 00824b2 commit facd901

File tree

3 files changed

+14
-121
lines changed

3 files changed

+14
-121
lines changed

‎extension/gwt/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@
2222
<groupId>com.glines.socketio</groupId>
2323
<artifactId>socketio-core</artifactId>
2424
</dependency>
25-
<!-- <dependency>
26-
<groupId>com.google.gwt</groupId>
27-
<artifactId>gwt-dev</artifactId>
28-
<version>2.1.1</version>
29-
</dependency> -->
3025
<dependency>
3126
<groupId>com.google.gwt</groupId>
3227
<artifactId>gwt-user</artifactId>
33-
<version>2.1.1</version>
3428
<scope>provided</scope>
3529
</dependency>
3630
</dependencies>

‎pom.xml

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@
6464

6565
<distributionManagement>
6666
<!-- TODO: switch repositories when deploying on OSS Sonatype repos -->
67-
<repository>
67+
<!--<repository>
6868
<id>mc-release</id>
6969
<url>dav:https://mc-repo.googlecode.com/svn/maven2/releases</url>
70-
</repository>
70+
</repository>-->
7171
<!--<repository>
7272
<id>socketio-staging</id>
7373
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
7474
</repository>-->
75-
<snapshotRepository>
75+
<!--<snapshotRepository>
7676
<id>mc-snapshot</id>
7777
<url>dav:https://mc-repo.googlecode.com/svn/maven2/snapshots</url>
7878
<uniqueVersion>false</uniqueVersion>
79-
</snapshotRepository>
79+
</snapshotRepository>-->
8080
<!--<snapshotRepository>
8181
<id>socketio-snapshots</id>
8282
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
@@ -213,8 +213,12 @@
213213
<artifactId>maven-license-plugin</artifactId>
214214
<version>1.9.0</version>
215215
<configuration>
216-
<header>licenses/MIT</header>
216+
<header>https://github.com/tadglines/Socket.IO-Java/raw/master/licenses/MIT</header>
217217
<strictCheck>true</strictCheck>
218+
<properties>
219+
<owner>Tad Glines</owner>
220+
<year>${project.inceptionYear}</year>
221+
</properties>
218222
<excludes>
219223
<exclude>.idea/**</exclude>
220224
<exclude>README</exclude>
@@ -226,6 +230,7 @@
226230
<exclude>**/logging.properties</exclude>
227231
<exclude>**/*.js</exclude>
228232
<exclude>**/*.swf</exclude>
233+
<exclude>**/com.glines.socketio.sample.gwtchat.GWTChat/**</exclude>
229234
</excludes>
230235
</configuration>
231236
</plugin>
@@ -293,36 +298,9 @@
293298
<artifactId>maven-license-plugin</artifactId>
294299
<executions>
295300
<execution>
296-
<id>licensing-1</id>
297-
<goals>
298-
<goal>check</goal>
299-
</goals>
300-
<configuration>
301-
<properties>
302-
<owner>Tad Glines</owner>
303-
<year>${project.inceptionYear}</year>
304-
</properties>
305-
<includes>
306-
<include>**/*.java</include>
307-
<include>**/*.xml</include>
308-
<include>**/*.html</include>
309-
</includes>
310-
</configuration>
311-
</execution>
312-
<execution>
313-
<id>licensing-2</id>
314301
<goals>
315302
<goal>check</goal>
316303
</goals>
317-
<configuration>
318-
<properties>
319-
<owner>Ovea</owner>
320-
<year>2011</year>
321-
</properties>
322-
<includes>
323-
<include>PLACEHOLDER</include>
324-
</includes>
325-
</configuration>
326304
</execution>
327305
</executions>
328306
</plugin>
@@ -392,44 +370,9 @@
392370
</dependency>
393371
<!-- Jetty -->
394372
<dependency>
395-
<groupId>javax.servlet</groupId>
396-
<artifactId>servlet-api</artifactId>
397-
<version>2.5</version>
398-
</dependency>
399-
<dependency>
400-
<groupId>org.eclipse.jetty</groupId>
401-
<artifactId>jetty-client</artifactId>
402-
<version>7.1.6.v20100715</version>
403-
</dependency>
404-
<dependency>
405-
<groupId>org.eclipse.jetty</groupId>
406-
<artifactId>jetty-continuation</artifactId>
407-
<version>7.1.6.v20100715</version>
408-
</dependency>
409-
<dependency>
410-
<groupId>org.eclipse.jetty</groupId>
411-
<artifactId>jetty-io</artifactId>
412-
<version>7.1.6.v20100715</version>
413-
</dependency>
414-
<dependency>
415-
<groupId>org.eclipse.jetty</groupId>
416-
<artifactId>jetty-server</artifactId>
417-
<version>7.1.6.v20100715</version>
418-
</dependency>
419-
<dependency>
420-
<groupId>org.eclipse.jetty</groupId>
421-
<artifactId>jetty-servlet</artifactId>
422-
<version>7.1.6.v20100715</version>
423-
</dependency>
424-
<dependency>
425-
<groupId>org.eclipse.jetty</groupId>
426-
<artifactId>jetty-util</artifactId>
427-
<version>7.1.6.v20100715</version>
428-
</dependency>
429-
<dependency>
430-
<groupId>org.eclipse.jetty</groupId>
431-
<artifactId>jetty-websocket</artifactId>
432-
<version>7.1.6.v20100715</version>
373+
<groupId>org.testatoo.container</groupId>
374+
<artifactId>testatoo-container-jetty</artifactId>
375+
<version>1.0-rc1</version>
433376
</dependency>
434377
<!-- GWT -->
435378
<dependency>

‎samples/pom.xml

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,54 +19,10 @@
1919
<description>Socket.IO Java Samples</description>
2020

2121
<modules>
22+
<module>echo</module>
2223
<module>broadcast</module>
2324
<module>chat</module>
2425
<module>chat-gwt</module>
25-
<module>echo</module>
2626
</modules>
2727

28-
<dependencies>
29-
<dependency>
30-
<groupId>javax.servlet</groupId>
31-
<artifactId>servlet-api</artifactId>
32-
<scope>provided</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>org.eclipse.jetty</groupId>
36-
<artifactId>jetty-continuation</artifactId>
37-
<scope>provided</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.eclipse.jetty</groupId>
41-
<artifactId>jetty-io</artifactId>
42-
<scope>provided</scope>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.eclipse.jetty</groupId>
46-
<artifactId>jetty-server</artifactId>
47-
<scope>provided</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.eclipse.jetty</groupId>
51-
<artifactId>jetty-servlet</artifactId>
52-
<scope>provided</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.eclipse.jetty</groupId>
56-
<artifactId>jetty-util</artifactId>
57-
<!--
58-
The jetty-maven-plugin won't include this jar on the class path unless
59-
the scope is compile or runtime. Because maven doesn't support specifying multiple
60-
scopes the scope here is set to "compile" and the jar is then excluded from the
61-
war's via "packageExcludes"
62-
TODO: Fix this once the jetty-maven-plugin gets fixed
63-
-->
64-
<scope>compile</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.eclipse.jetty</groupId>
68-
<artifactId>jetty-websocket</artifactId>
69-
<scope>provided</scope>
70-
</dependency>
71-
</dependencies>
7228
</project>

0 commit comments

Comments
 (0)