From dce91870507da036e96a841d3d978cb75c46bb09 Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Fri, 26 Jul 2013 23:38:29 -0400 Subject: [PATCH] Updated POM - Currently Builds against new Spout layout --- pom.xml | 4 ++-- src/main/java/org/spout/aquaduct/Aquaduct.java | 3 +-- .../java/org/spout/aquaduct/AquaductConfiguration.java | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 4a5aacd..9b0f952 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 2013 - dev-SNAPSHOT + 1.0.0-SNAPSHOT 0.0.1-SNAPSHOT custom @@ -93,7 +93,7 @@ org.spout - spoutapi + spout-api ${spoutVersion} provided diff --git a/src/main/java/org/spout/aquaduct/Aquaduct.java b/src/main/java/org/spout/aquaduct/Aquaduct.java index e2c3eea..33153b3 100644 --- a/src/main/java/org/spout/aquaduct/Aquaduct.java +++ b/src/main/java/org/spout/aquaduct/Aquaduct.java @@ -22,10 +22,9 @@ import java.util.LinkedList; import java.util.List; -import org.spout.api.exception.ConfigurationException; - import org.spout.aquaduct.server.Server; import org.spout.aquaduct.web.AquaductWebServer; +import org.spout.cereal.config.ConfigurationException; public class Aquaduct { private static Aquaduct instance = null; diff --git a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java index d148ecd..87104db 100644 --- a/src/main/java/org/spout/aquaduct/AquaductConfiguration.java +++ b/src/main/java/org/spout/aquaduct/AquaductConfiguration.java @@ -20,11 +20,11 @@ package org.spout.aquaduct; import java.io.File; +import org.spout.cereal.config.ConfigurationException; +import org.spout.cereal.config.ConfigurationHolder; +import org.spout.cereal.config.ConfigurationHolderConfiguration; +import org.spout.cereal.config.yaml.YamlConfiguration; -import org.spout.api.exception.ConfigurationException; -import org.spout.api.util.config.ConfigurationHolder; -import org.spout.api.util.config.ConfigurationHolderConfiguration; -import org.spout.api.util.config.yaml.YamlConfiguration; public class AquaductConfiguration extends ConfigurationHolderConfiguration { public static ConfigurationHolder BIND_ADDRESS = new ConfigurationHolder((Object) null, "bind.address");