Skip to content

Commit 4448aea

Browse files
sbordetsbordet
committed
Fixes COMETD-412 (Lazy channels inconsistencies).
Also updated dependencies versions.
1 parent 959c4e0 commit 4448aea

File tree

29 files changed

+561
-145
lines changed

29 files changed

+561
-145
lines changed

‎cometd-archetypes/dojo-jetty7/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.5</source>
2020
<target>1.5</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-archetypes/dojo-jetty8/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.6</source>
2020
<target>1.6</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-archetypes/jquery-jetty7/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.5</source>
2020
<target>1.5</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-archetypes/jquery-jetty8/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.6</source>
2020
<target>1.6</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-archetypes/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<extension>
3333
<groupId>org.apache.maven.archetype</groupId>
3434
<artifactId>archetype-packaging</artifactId>
35-
<version>2.1</version>
35+
<version>2.2</version>
3636
</extension>
3737
</extensions>
3838
<plugins>

‎cometd-archetypes/spring-dojo-jetty7/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.5</source>
2020
<target>1.5</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-archetypes/spring-jquery-jetty7/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<plugins>
1515
<plugin>
1616
<artifactId>maven-compiler-plugin</artifactId>
17-
<version>2.3.2</version>
17+
<version>3.0</version>
1818
<configuration>
1919
<source>1.5</source>
2020
<target>1.5</target>
2121
</configuration>
2222
</plugin>
2323
<plugin>
2424
<artifactId>maven-war-plugin</artifactId>
25-
<version>2.1.1</version>
25+
<version>2.3</version>
2626
<configuration>
2727
<overlays>
2828
<overlay />

‎cometd-demo/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
<dependency>
8080
<groupId>javax.servlet</groupId>
8181
<artifactId>servlet-api</artifactId>
82-
<version>2.5</version>
83-
<scope>provided</scope>
8482
</dependency>
8583
<dependency>
8684
<groupId>org.cometd.javascript</groupId>

‎cometd-java/cometd-java-annotations/pom.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<dependency>
1616
<groupId>javax.servlet</groupId>
1717
<artifactId>servlet-api</artifactId>
18-
<version>2.5</version>
19-
<scope>provided</scope>
2018
</dependency>
2119
<dependency>
2220
<groupId>javax.inject</groupId>
@@ -55,7 +53,7 @@
5553
</dependency>
5654
<dependency>
5755
<groupId>org.slf4j</groupId>
58-
<artifactId>slf4j-simple</artifactId>
56+
<artifactId>slf4j-log4j12</artifactId>
5957
</dependency>
6058
<dependency>
6159
<groupId>org.cometd.java</groupId>

‎cometd-java/cometd-java-annotations/src/test/resources/log4j.properties‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# LOG4J levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, ALL
2+
#
3+
log4j.rootLogger=ALL,CONSOLE
4+
5+
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
6+
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
7+
log4j.appender.CONSOLE.layout.ConversionPattern=%d %t [%5p][%c{1}] %m%n
8+
log4j.appender.CONSOLE.target=System.err
9+
10+
# Level tuning
11+
log4j.logger.org.eclipse.jetty=INFO
12+
log4j.logger.org.cometd=INFO

0 commit comments

Comments
 (0)