Merge pull request #2 from yiming187/master

apollo-server/pom.xml

@@ -15,5 +15,22 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

apollo-server/src/main/java/com/ctrip/apollo/ConfigServerApplication.java

+package com.ctrip.apollo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+@SpringBootApplication
+@EnableConfigServer
+public class ConfigServerApplication {
+
+  public static void main(String[] args) {
+    SpringApplication.run(ConfigServerApplication.class, args);
+  }
+
+}

apollo-server/src/main/resources/application.yml

+server:
+  port: 8888
+  
+logging:
+  level:
+    org.springframework.cloud: 'DEBUG'
+
+spring:
+  profiles:
+    active: native

apollo-server/src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: apollo-server
\ No newline at end of file

pom.xml

@@ -7,7 +7,6 @@
 	<version>0.0.1</version>
 	<name>Apollo</name>
 	<packaging>pom</packaging>
-
 	<modules>
 		<module>apollo-core</module>
 		<module>apollo-metaserver</module>
@@ -55,9 +54,11 @@
 			</dependency>
 			<!--third party -->
 			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter</artifactId>
-				<version>1.3.3.RELEASE</version>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-parent</artifactId>
+				<version>Angel.SR6</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>mysql</groupId>
@@ -66,12 +67,6 @@
 			</dependency>
 			<!--for test -->
 			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-test</artifactId>
-				<version>1.3.3.RELEASE</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
 				<groupId>com.h2database</groupId>
 				<artifactId>h2</artifactId>
 				<version>1.4.191</version>
@@ -89,8 +84,19 @@
 			<url>http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxsnapshot</url>
 		</snapshotRepository>
 	</distributionManagement>
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+		<java.version>1.8</java.version>
 	</properties>
 </project>