Merge branch 'master' of http://10.1.235.20:3000/rest/rest-guide

comp-example/pom.xml

@@ -2,6 +2,12 @@
	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>
	<parent>
		<groupId>com.ai.ipu</groupId>
		<artifactId>ipu-aggregator</artifactId>
		<version>3.1-SNAPSHOT</version>
	</parent>
	<groupId>com.ai.ipu.example</groupId>
	<artifactId>comp-example</artifactId>
	<version>1.0</version>
@@ -13,6 +19,7 @@
	<properties>
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
		<ipu>3.1-SNAPSHOT</ipu>
		<jdk>1.8</jdk>
	</properties>
	<dependencies>

ipu-rest-demo/pom.xml

@@ -70,5 +70,11 @@
	</dependencies>
	<build>
		<plugins>
			<plugin>
				<groupId>org.springframework.boot</groupId>
				<artifactId>spring-boot-maven-plugin</artifactId>
			</plugin>
		</plugins>
	</build>
</project>