Skip to content

Commit

Permalink
Renamed to Aquaduct, now under AGPL license.
Browse files Browse the repository at this point in the history
Cleaned up pom.xml and made things a bit more dynamic.
  • Loading branch information
Wulfspider committed Jan 14, 2013
1 parent 31fafa9 commit 5ee997a
Show file tree
Hide file tree
Showing 40 changed files with 1,607 additions and 397 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# LF ling endings on repository and locally
* text eol=lf
*.java text eol=lf

# Binary files that should not be modified
*.dat binary
*.db binary
*.jpg binary
*.png binary
*.ttf binary
*.wav binary
21 changes: 12 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,29 @@ ehthumbs.db
Icon?
Thumbs.db

# Build files #
#################
MANIFEST.MF
dependency-reduced-pom.xml

# Project files #
#################
.classpath
.externalToolBuilders
.idea
.project
.settings
MANIFEST.MF

# Netbeans files #
##################
build
dist
nbproject
atlassian-ide-plugin.xml
build.xml
nb-configuration.xml

# IntelliJ IDEA files #
#######################
.idea
*.iml
*.ipr
*.iws
/config.yml

# Misc files #
##############
*.bak
config.yml
17 changes: 17 additions & 0 deletions HEADER.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
This file is part of ${name}.

${copyright} <${url}/>
${name} is licensed under the GNU Affero General Public License.

${name} is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.

${name} is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
661 changes: 661 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

256 changes: 232 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,113 @@
<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>flo</artifactId>
<artifactId>aquaduct</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Flo</name>
<description>A Control Panel for Spout Servers</description>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
<url>http://www.spout.org</url>
<inceptionYear>2012</inceptionYear>
<description>Web control panel for the Spout voxel game platform.</description>

<!-- Build properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<currentYear>2013</currentYear>
<spoutVersion>dev-SNAPSHOT</spoutVersion>
<blueberryVersion>0.0.1-SNAPSHOT</blueberryVersion>
<buildNumber>custom</buildNumber>
</properties>

<!-- Company information -->
<organization>
<name>Spout LLC</name>
<url>http://www.spout.org</url>
</organization>

<!-- License information -->
<licenses>
<license>
<name>GNU Affero General Public License</name>
<url>http://www.gnu.org/licenses/agpl.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<!-- Source code access -->
<scm>
<developerConnection>scm:git:[email protected]:SpoutDev/Aquaduct.git</developerConnection>
<connection>scm:git:git://github.com/SpoutDev/Aquaduct.git</connection>
<url>https://github.com/SpoutDev/Aquaduct</url>
</scm>

<!-- Build server -->
<ciManagement>
<system>jenkins</system>
<url>http://build.spout.org/job/Aquaduct</url>
</ciManagement>

<!-- Issue tracker -->
<issueManagement>
<system>jira</system>
<url>http://issues.spout.org/browse/PANEL</url>
</issueManagement>

<!-- Dependency repositories -->
<repositories>
<repository>
<id>spout-repo</id>
<url>http://repo.spout.org</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>spoutapi</artifactId>
<version>dev-SNAPSHOT</version>
<version>${spoutVersion}</version>
<scope>provided</scope>
</dependency>
<!-- Included in final JAR -->
<dependency>
<groupId>com.narrowtux</groupId>
<artifactId>blueberry</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.10</version>
<version>${blueberryVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.3</version>
<version>2.4</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -51,6 +120,145 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.11</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

<!-- Build configuration -->
<build>
<defaultGoal>clean install</defaultGoal>

<!-- Resources to include -->
<resources>
<!-- Static resources -->
<resource>
<filtering>false</filtering>
<directory>${project.basedir}</directory>
<targetPath>.</targetPath>
<includes>
<include>LICENSE.txt</include>
</includes>
</resource>
<!-- Filtered resources -->
<resource>
<filtering>true</filtering>
<directory>${project.basedir}/src/main/resources</directory>
<targetPath>.</targetPath>
<includes>
<include>**/*.html</include>
</includes>
</resource>
</resources>

<!-- Build plugins -->
<plugins>
<!-- License headers plugin -->
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.10.b1</version>
<executions>
<execution>
<configuration>
<properties>
<name>${project.name}</name>
<url>${project.organization.url}</url>
<copyright>Copyright (c) ${project.inceptionYear}-${currentYear}, ${project.organization.name}</copyright>
</properties>
<quiet>true</quiet>
<encoding>UTF-8</encoding>
<strictCheck>true</strictCheck>
<header>${project.basedir}/HEADER.txt</header>
<mapping>
<java>SLASHSTAR_STYLE</java>
</mapping>
<keywords>
<keyword>${project.name}</keyword>
<keyword>license</keyword>
</keywords>
<includes>
<include>src/main/java/**</include>
<include>src/test/java/**</include>
</includes>
</configuration>
<phase>clean</phase>
<goals>
<goal>format</goal>
</goals>
</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>
<compilerArguments>
<O>-Xlint:all</O>
<O>-Xlint:-path</O>
</compilerArguments>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</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>
Loading

0 comments on commit 5ee997a

Please sign in to comment.