andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade depepdencies to the latest versions

Browse Source 
* Regenerate LocalTimeProtocol.java with the latest protoc
* Add an instruction on how to generate LocalTimeProtocol.java
* Not upgrading maven-bundle-plugin, which has a regression in 2.3.5:
  * https://issues.apache.org/jira/browse/FELIX-3058

Conflicts:

	src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java
This commit is contained in:
Trustin Lee 2011-11-24 10:54:01 +09:00
parent e015456ae1
commit 5abd23d3ba
3 changed files with 1404 additions and 700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>2.3.0</version> <version>2.4.1</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -114,7 +114,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
<scope>compile</scope> <scope>compile</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -168,13 +168,13 @@
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
<artifactId>easymock</artifactId> <artifactId>easymock</artifactId>
<version>2.5.2</version> <version>3.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.easymock</groupId> <groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId> <artifactId>easymockclassextension</artifactId>
<version>2.5.2</version> <version>3.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -186,7 +186,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>1.6.1</version> <version>1.6.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -211,7 +211,7 @@
<plugin> <plugin>
<!-- See org.jboss:jboss-parent --> <!-- See org.jboss:jboss-parent -->
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version> <version>1.0.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -227,7 +227,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version> <version>2.5</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
@ -258,7 +258,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version> <version>2.10</version>
<configuration> <configuration>
<forkMode>once</forkMode> <forkMode>once</forkMode>
<excludes> <excludes>
@ -315,7 +315,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version> <version>1.7</version>
<executions> <executions>
<execution> <execution>
<id>write-version</id> <id>write-version</id>
@ -420,7 +420,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version> <version>2.8</version>
<executions> <executions>
<execution> <execution>
<id>generate-javadoc</id> <id>generate-javadoc</id>
@ -479,7 +479,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.2</version> <version>2.3</version>
<executions> <executions>
<execution> <execution>
<id>generate-xref</id> <id>generate-xref</id>
@ -601,7 +601,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version> <version>2.2.1</version>
<executions> <executions>
<execution> <execution>
<id>generate-distribution</id> <id>generate-distribution</id>
@ -622,7 +622,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.1</version> <version>2.2.1</version>
<configuration> <configuration>
<!-- We don't want to use the default release profile because it <!-- We don't want to use the default release profile because it
causes the JavaDoc and source jars to be deployed twice. --> causes the JavaDoc and source jars to be deployed twice. -->

1769
src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java
View File

File diff suppressed because it is too large Load Diff

7
src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto
View File

@ -15,6 +15,13 @@
*/ */
package org.jboss.netty.example.localtime; package org.jboss.netty.example.localtime;
// How to generate
// ===============
// $ protoc src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto \
// --java_out=src/main/java
//
// Add @SuppressWarnings("all") to the generated code not to pollute IDE task list.
option optimize_for = SPEED; option optimize_for = SPEED;
enum Continent { enum Continent {