diff --git a/HEADER.txt b/HEADER.txt index cd7403e..a3387b7 100644 --- a/HEADER.txt +++ b/HEADER.txt @@ -1,6 +1,6 @@ This file is part of ${name}. -${copyright} <${url}/> +Copyright (c) ${inceptionYear} ${organization} <${url}/> ${name} is licensed under the GNU Affero General Public License. ${name} is free software: you can redistribute it and/or modify diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index 9b0f952..38df915 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 @@ -7,20 +6,25 @@ org.spout aquaduct 0.0.1-SNAPSHOT + jar http://www.spout.org 2012 Web control panel for the Spout voxel game platform. + + + org.spout + shared-parent + 1 + + UTF-8 - 2013 - 1.0.0-SNAPSHOT - 0.0.1-SNAPSHOT - custom + 0 - + Spout LLC http://www.spout.org @@ -37,28 +41,28 @@ - scm:git:git@github.com:SpoutDev/Aquaduct.git scm:git:git://github.com/SpoutDev/Aquaduct.git + scm:git:git@github.com:SpoutDev/Aquaduct.git https://github.com/SpoutDev/Aquaduct - + - jenkins - http://build.spout.org/job/Aquaduct + travis + https://travis-ci.org/SpoutDev/Aquaduct - + jira - http://issues.spout.org/browse/PANEL + http://spoutdev.atlassian.net/browse/WEB spout-repo - http://repo.spout.org + http://nexus.spout.org/content/groups/public true always @@ -66,42 +70,13 @@ - - - - spout-repo - http://repo.spout.org - - - - - - - - spout-releases - http://nexus.spout.org/content/repositories/releases - - - - spout-snapshots - http://nexus.spout.org/content/repositories/snapshots - - - - - - org.spout - spout-api - ${spoutVersion} - provided - - + com.narrowtux blueberry - ${blueberryVersion} + 0.0.1-SNAPSHOT compile @@ -111,23 +86,30 @@ compile - org.apache.commons - commons-lang3 - 3.1 + com.google.code.gson + gson + 2.2.4 compile - com.google.code.gson - gson - 2.2.2 + org.apache.commons + commons-lang3 + 3.1 compile org.yaml snakeyaml - 1.11 + 1.12 compile + + + org.spout + spout-api + 1.0.0-SNAPSHOT + provided + @@ -139,7 +121,7 @@ false - ${project.basedir} + . . LICENSE.txt @@ -148,7 +130,7 @@ true - ${project.basedir}/src/main/resources + src/main/resources . **/*.html @@ -158,7 +140,7 @@ - + com.mycila.maven-license-plugin maven-license-plugin @@ -169,12 +151,13 @@ ${project.name} ${project.organization.url} - Copyright (c) ${project.inceptionYear}-${currentYear}, ${project.organization.name} + ${project.inceptionYear} + ${project.organization.name} true UTF-8 true -
${project.basedir}/HEADER.txt
+
HEADER.txt
SLASHSTAR_STYLE @@ -194,32 +177,14 @@ - - - com.sourcesense.maven - maven-nosnapshot-plugin - 0.0.7 - - - - ${project.version} - releaseVersion - - initialize - - strip - - - - org.apache.maven.plugins maven-compiler-plugin 3.0 - 1.6 - 1.6 + 1.7 + 1.7 -Xlint:all -Xlint:-path @@ -228,37 +193,37 @@ true + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + + true + + + *:* + + lib/** + templates/** + META-INF/*.xml + META-INF/*.txt + **/LICENSE + **/NOTICE + **/DEPENDENCIES + + + + + package + + shade + + + + - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - com.sourcesense.maven - maven-nosnapshot-plugin - [0.0.7,) - - strip - - - - - - - - - - - - diff --git a/src/main/java/org/spout/aquaduct/Aquaduct.java b/src/main/java/org/spout/aquaduct/Aquaduct.java index 33153b3..41fd35e 100644 --- a/src/main/java/org/spout/aquaduct/Aquaduct.java +++ b/src/main/java/org/spout/aquaduct/Aquaduct.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java index a53e11d..f00db7a 100644 --- a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java +++ b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/Start.java b/src/main/java/org/spout/aquaduct/Start.java index 88d715e..53b23d1 100644 --- a/src/main/java/org/spout/aquaduct/Start.java +++ b/src/main/java/org/spout/aquaduct/Start.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/Plugin.java b/src/main/java/org/spout/aquaduct/server/Plugin.java index 89a8e99..d5f2ebf 100644 --- a/src/main/java/org/spout/aquaduct/server/Plugin.java +++ b/src/main/java/org/spout/aquaduct/server/Plugin.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/PluginException.java b/src/main/java/org/spout/aquaduct/server/PluginException.java index 19565e8..b27c229 100644 --- a/src/main/java/org/spout/aquaduct/server/PluginException.java +++ b/src/main/java/org/spout/aquaduct/server/PluginException.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/PluginManager.java b/src/main/java/org/spout/aquaduct/server/PluginManager.java index a0eb3b2..63811f7 100644 --- a/src/main/java/org/spout/aquaduct/server/PluginManager.java +++ b/src/main/java/org/spout/aquaduct/server/PluginManager.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/Server.java b/src/main/java/org/spout/aquaduct/server/Server.java index 0ff4d51..2249818 100644 --- a/src/main/java/org/spout/aquaduct/server/Server.java +++ b/src/main/java/org/spout/aquaduct/server/Server.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/ServerStatus.java b/src/main/java/org/spout/aquaduct/server/ServerStatus.java index 518054d..39e7afc 100644 --- a/src/main/java/org/spout/aquaduct/server/ServerStatus.java +++ b/src/main/java/org/spout/aquaduct/server/ServerStatus.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/SpoutPluginManager.java b/src/main/java/org/spout/aquaduct/server/SpoutPluginManager.java index 93fe6e5..37fc0c3 100644 --- a/src/main/java/org/spout/aquaduct/server/SpoutPluginManager.java +++ b/src/main/java/org/spout/aquaduct/server/SpoutPluginManager.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/server/SpoutServer.java b/src/main/java/org/spout/aquaduct/server/SpoutServer.java index f63b72c..0fc22e4 100644 --- a/src/main/java/org/spout/aquaduct/server/SpoutServer.java +++ b/src/main/java/org/spout/aquaduct/server/SpoutServer.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/AquaductWebServer.java b/src/main/java/org/spout/aquaduct/web/AquaductWebServer.java index c3ce3f4..ded1d1e 100644 --- a/src/main/java/org/spout/aquaduct/web/AquaductWebServer.java +++ b/src/main/java/org/spout/aquaduct/web/AquaductWebServer.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java b/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java index 8220573..ec835ed 100644 --- a/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java +++ b/src/main/java/org/spout/aquaduct/web/AquaductWebSocketHandler.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java b/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java index 212f923..15227a3 100644 --- a/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java +++ b/src/main/java/org/spout/aquaduct/web/ResourceFileHandler.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/WebClientEvent.java b/src/main/java/org/spout/aquaduct/web/WebClientEvent.java index 540d447..198b112 100644 --- a/src/main/java/org/spout/aquaduct/web/WebClientEvent.java +++ b/src/main/java/org/spout/aquaduct/web/WebClientEvent.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/WebClientFrame.java b/src/main/java/org/spout/aquaduct/web/WebClientFrame.java index 3882c0a..d20f9c6 100644 --- a/src/main/java/org/spout/aquaduct/web/WebClientFrame.java +++ b/src/main/java/org/spout/aquaduct/web/WebClientFrame.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/WebClientRequestHandler.java b/src/main/java/org/spout/aquaduct/web/WebClientRequestHandler.java index 0a8e6b2..67cc7ec 100644 --- a/src/main/java/org/spout/aquaduct/web/WebClientRequestHandler.java +++ b/src/main/java/org/spout/aquaduct/web/WebClientRequestHandler.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify diff --git a/src/main/java/org/spout/aquaduct/web/WebClientResponse.java b/src/main/java/org/spout/aquaduct/web/WebClientResponse.java index 4e57750..9cbfca0 100644 --- a/src/main/java/org/spout/aquaduct/web/WebClientResponse.java +++ b/src/main/java/org/spout/aquaduct/web/WebClientResponse.java @@ -1,7 +1,7 @@ /* * This file is part of Aquaduct. * - * Copyright (c) 2012-2013, Spout LLC + * Copyright (c) 2012 Spout LLC * Aquaduct is licensed under the GNU Affero General Public License. * * Aquaduct is free software: you can redistribute it and/or modify