aboutsummaryrefslogtreecommitdiff
path: root/webserver
diff options
context:
space:
mode:
authorPaul Hawke <paul.hawke@gmail.com>2013-05-21 23:00:57 -0500
committerPaul Hawke <paul.hawke@gmail.com>2013-05-21 23:00:57 -0500
commit84dcf74395d1817c4a2a7861bd5d3787daa6700a (patch)
tree7df95c1b0df3a329baae8b70e608203eb924c666 /webserver
parentcd6091a6ed384f915a5232efb19cf2d988b59f83 (diff)
downloadnanohttpd-84dcf74395d1817c4a2a7861bd5d3787daa6700a.tar.gz
Tidied up copyright statements, making them consistent, and updated version numbers to 2.0.0 throughout.
Diffstat (limited to 'webserver')
-rw-r--r--webserver/pom.xml34
-rw-r--r--webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java4
2 files changed, 5 insertions, 33 deletions
diff --git a/webserver/pom.xml b/webserver/pom.xml
index 6b6384d..b89f691 100644
--- a/webserver/pom.xml
+++ b/webserver/pom.xml
@@ -4,46 +4,20 @@
<groupId>fi.iki.elonen</groupId>
<artifactId>nanohttpd-webserver</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
<packaging>jar</packaging>
- <name>NanoHTTPd-Webserver</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <name>NanoHttpd-Webserver</name>
+ <url>https://github.com/NanoHttpd/nanohttpd</url>
<dependencies>
<dependency>
<groupId>fi.iki.elonen</groupId>
<artifactId>nanohttpd</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0</version>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>fictional-io</id>
- <name>fictional.io</name>
- <url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
- <uniqueVersion>false</uniqueVersion>
- </repository>
- <snapshotRepository>
- <id>fictional-io</id>
- <name>fictional.io</name>
- <url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <scm>
- <connection>scm:git:git://github.com/psh/nanohttpd.git</connection>
- <url>scm:git:git://github.com/psh/nanohttpd.git</url>
- <developerConnection>scm:git:git://github.com/psh/nanohttpd.git</developerConnection>
- <tag>nanohttpd-1.0.0</tag>
- </scm>
-
<build>
<extensions>
<extension>
diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
index ab10744..5be8bd5 100644
--- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
@@ -45,9 +45,7 @@ public class SimpleWebServer extends NanoHTTPD {
* The distribution licence
*/
private static final String LICENCE =
- "Copyright (C) 2001,2005-2011 by Jarno Elonen <elonen@iki.fi>,\n"
- + "(C) 2010 by Konstantinos Togias <info@ktogias.gr>\n"
- + "and (C) 2012- by Paul S. Hawke\n"
+ "Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias\n"
+ "\n"
+ "Redistribution and use in source and binary forms, with or without\n"
+ "modification, are permitted provided that the following conditions\n"