From 826d5ff38323240a5c5399945778a802a520a38b Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 14 Oct 2014 17:34:28 +0100
Subject: [PATCH] Tidy (mostly pom warnings)

---
 .../cloud/netflix/archaius/ArchaiusAutoConfiguration.java   | 6 +++---
 spring-cloud-netflix-zuul/pom.xml                           | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
index f65cc5cf..b243c27e 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
@@ -3,6 +3,7 @@ package org.springframework.cloud.netflix.archaius;
 import com.netflix.config.ConcurrentCompositeConfiguration;
 import com.netflix.config.ConfigurationManager;
 import com.netflix.config.DynamicURLConfiguration;
+
 import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
 import org.slf4j.Logger;
@@ -16,8 +17,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.netflix.config.ConfigurationBasedDeploymentContext.DEPLOYMENT_APPLICATION_ID_PROPERTY;
 import static com.netflix.config.ConfigurationManager.*;
-import static com.netflix.config.ConfigurationManager.APPLICATION_PROPERTIES;
-import static com.netflix.config.ConfigurationManager.ENV_CONFIG_NAME;
 
 /**
  * @author Spencer Gibb
@@ -38,7 +37,8 @@ public class ArchaiusAutoConfiguration {
         return envConfig;
     }
 
-    protected void configureArchaius(ConfigurableEnvironmentConfiguration envConfig) {
+    @SuppressWarnings("deprecation")
+	protected void configureArchaius(ConfigurableEnvironmentConfiguration envConfig) {
         if (initialized.compareAndSet(false, true)) {
             String appName = env.getProperty("spring.application.name");
             if (appName == null) {
diff --git a/spring-cloud-netflix-zuul/pom.xml b/spring-cloud-netflix-zuul/pom.xml
index 4bf300eb..4e2640f3 100644
--- a/spring-cloud-netflix-zuul/pom.xml
+++ b/spring-cloud-netflix-zuul/pom.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-netflix-zuul</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Spring Cloud Netflix Zuul</name>
     <url>http://projects.spring.io/spring-cloud/</url>
@@ -53,7 +51,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-netflix-core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>