Cleanup and update pom and header.

Add blank readme for future use.
spoutdev · Aug 8, 2013 · 8a1df94 · 8a1df94
1 parent ea80453
commit 8a1df94
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 126 deletions.
diff --git 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
diff --git a/pom.xml b/pom.xml
@@ -1,26 +1,30 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<!-- Project information -->
 	<name>Aquaduct</name>
 	<groupId>org.spout</groupId>
 	<artifactId>aquaduct</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
 	<url>http://www.spout.org</url>
 	<inceptionYear>2012</inceptionYear>
 	<description>Web control panel for the Spout voxel game platform.</description>
 
+	<!-- Parent information -->
+	<parent>
+		<groupId>org.spout</groupId>
+		<artifactId>shared-parent</artifactId>
+		<version>1</version>
+	</parent>
+
 	<!-- Build properties -->
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<currentYear>2013</currentYear>
-		<spoutVersion>1.0.0-SNAPSHOT</spoutVersion>
-		<blueberryVersion>0.0.1-SNAPSHOT</blueberryVersion>
-		<buildNumber>custom</buildNumber>
+		<buildNumber>0</buildNumber>
 	</properties>
 
-	<!-- Company information -->
+	<!-- Organization information -->
 	<organization>
 		<name>Spout LLC</name>
 		<url>http://www.spout.org</url>
@@ -37,71 +41,42 @@
 
 	<!-- Source code access -->
 	<scm>
-		<developerConnection>scm:git:[email protected]:SpoutDev/Aquaduct.git</developerConnection>
 		<connection>scm:git:git://github.com/SpoutDev/Aquaduct.git</connection>
+		<developerConnection>scm:git:[email protected]:SpoutDev/Aquaduct.git</developerConnection>
 		<url>https://github.com/SpoutDev/Aquaduct</url>
 	</scm>
 
-	<!-- Build server -->
+	<!-- Continuous integration -->
 	<ciManagement>
-		<system>jenkins</system>
-		<url>http://build.spout.org/job/Aquaduct</url>
+		<system>travis</system>
+		<url>https://travis-ci.org/SpoutDev/Aquaduct</url>
 	</ciManagement>
 
-	<!-- Issue tracker -->
+	<!-- Issue management -->
 	<issueManagement>
 		<system>jira</system>
-		<url>http://issues.spout.org/browse/PANEL</url>
+		<url>http://spoutdev.atlassian.net/browse/WEB</url>
 	</issueManagement>
 
 	<!-- Dependency repositories -->
 	<repositories>
 		<repository>
 			<id>spout-repo</id>
-			<url>http://repo.spout.org</url>
+			<url>http://nexus.spout.org/content/groups/public</url>
 			<snapshots>
 				<enabled>true</enabled>
 				<updatePolicy>always</updatePolicy>
 			</snapshots>
 		</repository>
 	</repositories>
 
-	<!-- Build plugin repositories -->
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spout-repo</id>
-			<url>http://repo.spout.org</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<!-- Distribution management -->
-	<distributionManagement>
-		<!-- Publish releases here -->
-		<repository>
-			<id>spout-releases</id>
-			<url>http://nexus.spout.org/content/repositories/releases</url>
-		</repository>
-		<!-- Publish snapshots here -->
-		<snapshotRepository>
-			<id>spout-snapshots</id>
-			<url>http://nexus.spout.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
 	<!-- Project dependencies -->
 	<dependencies>
-		<!-- Provided by third-party -->
-		<dependency>
-			<groupId>org.spout</groupId>
-			<artifactId>spout-api</artifactId>
-			<version>${spoutVersion}</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- Included in final JAR -->
+		<!-- Include in final JAR -->
 		<dependency>
 			<groupId>com.narrowtux</groupId>
 			<artifactId>blueberry</artifactId>
-			<version>${blueberryVersion}</version>
+			<version>0.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -111,23 +86,30 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.1</version>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.2.2</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.11</version>
+			<version>1.12</version>
 			<scope>compile</scope>
 		</dependency>
+		<!-- Provided by third-party -->
+		<dependency>
+			<groupId>org.spout</groupId>
+			<artifactId>spout-api</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<!-- Build configuration -->
@@ -139,7 +121,7 @@
 			<!-- Static resources -->
 			<resource>
 				<filtering>false</filtering>
-				<directory>${project.basedir}</directory>
+				<directory>.</directory>
 				<targetPath>.</targetPath>
 				<includes>
 					<include>LICENSE.txt</include>
@@ -148,7 +130,7 @@
 			<!-- Filtered resources -->
 			<resource>
 				<filtering>true</filtering>
-				<directory>${project.basedir}/src/main/resources</directory>
+				<directory>src/main/resources</directory>
 				<targetPath>.</targetPath>
 				<includes>
 					<include>**/*.html</include>
@@ -158,7 +140,7 @@
 
 		<!-- Build plugins -->
 		<plugins>
-			<!-- License headers plugin -->
+			<!-- License header plugin -->
 			<plugin>
 				<groupId>com.mycila.maven-license-plugin</groupId>
 				<artifactId>maven-license-plugin</artifactId>
@@ -169,12 +151,13 @@
 							<properties>
 								<name>${project.name}</name>
 								<url>${project.organization.url}</url>
-								<copyright>Copyright (c) ${project.inceptionYear}-${currentYear}, ${project.organization.name}</copyright>
+								<inceptionYear>${project.inceptionYear}</inceptionYear>
+								<organization>${project.organization.name}</organization>
 							</properties>
 							<quiet>true</quiet>
 							<encoding>UTF-8</encoding>
 							<strictCheck>true</strictCheck>
-							<header>${project.basedir}/HEADER.txt</header>
+							<header>HEADER.txt</header>
 							<mapping>
 								<java>SLASHSTAR_STYLE</java>
 							</mapping>
@@ -194,32 +177,14 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- Release version plugin -->
-			<plugin>
-				<groupId>com.sourcesense.maven</groupId>
-				<artifactId>maven-nosnapshot-plugin</artifactId>
-				<version>0.0.7</version>
-				<executions>
-					<execution>
-						<configuration>
-							<version>${project.version}</version>
-							<propertyName>releaseVersion</propertyName>
-						</configuration>
-						<phase>initialize</phase>
-						<goals>
-							<goal>strip</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<!-- Source compiler plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<compilerArguments>
 						<O>-Xlint:all</O>
 						<O>-Xlint:-path</O>
@@ -228,37 +193,37 @@
 					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
+			<!-- Dependency addition plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>2.1</version>
+				<executions>
+					<execution>
+						<configuration>
+							<minimizeJar>true</minimizeJar>
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>lib/**</exclude>
+										<exclude>templates/**</exclude>
+										<exclude>META-INF/*.xml</exclude>
+										<exclude>META-INF/*.txt</exclude>
+										<exclude>**/LICENSE</exclude>
+										<exclude>**/NOTICE</exclude>
+										<exclude>**/DEPENDENCIES</exclude>
+									</excludes>
+								</filter>
+							</filters>
+						</configuration>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-
-		<!-- Plugin management -->
-		<pluginManagement>
-			<plugins>
-				<!-- Eclipse exclusions -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>com.sourcesense.maven</groupId>
-										<artifactId>maven-nosnapshot-plugin</artifactId>
-										<versionRange>[0.0.7,)</versionRange>
-										<goals>
-											<goal>strip</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<execute/>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 </project>
diff --git 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 <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * 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
@@ -1,7 +1,7 @@
 /*
  * This file is part of Aquaduct.
  *
- * Copyright (c) 2012-2013, Spout LLC <http://www.spout.org/>
+ * Copyright (c) 2012 Spout LLC <http://www.spout.org/>
  * Aquaduct is licensed under the GNU Affero General Public License.
  *
  * Aquaduct is free software: you can redistribute it and/or modify