Commit 911627c0 by Phillip Webb

Add eclipse formatting and cleanup configuration

parent be436279
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<properties> <properties>
<main.basedir>${basedir}</main.basedir>
<archaius.version>0.6.3</archaius.version> <archaius.version>0.6.3</archaius.version>
<eureka.version>1.1.145</eureka.version> <eureka.version>1.1.145</eureka.version>
<feign.version>6.1.3</feign.version> <feign.version>6.1.3</feign.version>
...@@ -31,6 +32,34 @@ ...@@ -31,6 +32,34 @@
<spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version> <spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
<cloud-connectors.version>1.1.1.BUILD-SNAPSHOT</cloud-connectors.version> <cloud-connectors.version>1.1.1.BUILD-SNAPSHOT</cloud-connectors.version>
</properties> </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<useProjectReferences>false</useProjectReferences>
<additionalConfig>
<file>
<name>.settings/org.eclipse.jdt.ui.prefs</name>
<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
</file>
<file>
<name>.settings/org.eclipse.jdt.core.prefs</name>
<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
</file>
</additionalConfig>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -267,15 +296,4 @@ ...@@ -267,15 +296,4 @@
<module>spring-cloud-netflix-sidecar</module> <module>spring-cloud-netflix-sidecar</module>
<module>docs</module> <module>docs</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Cloud Netflix Core</name> <name>Spring Cloud Netflix Core</name>
<description>Spring Cloud Netflix Core</description> <description>Spring Cloud Netflix Core</description>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<name>Spring Cloud Netflix Eureka Server</name> <name>Spring Cloud Netflix Eureka Server</name>
<url>http://projects.spring.io/spring-cloud/</url> <url>http://projects.spring.io/spring-cloud/</url>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir>
<spring-cloud.version>1.0.0.BUILD-SNAPSHOT</spring-cloud.version> <spring-cloud.version>1.0.0.BUILD-SNAPSHOT</spring-cloud.version>
<wro4j.version>1.7.6</wro4j.version> <wro4j.version>1.7.6</wro4j.version>
</properties> </properties>
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Cloud Netflix Hystrix AMQP</name> <name>Spring Cloud Netflix Hystrix AMQP</name>
<description>Spring Cloud Netflix Hystrix AMQP</description> <description>Spring Cloud Netflix Hystrix AMQP</description>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir>
<spring-cloud.version>1.0.0.BUILD-SNAPSHOT</spring-cloud.version> <spring-cloud.version>1.0.0.BUILD-SNAPSHOT</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Spring Cloud Netflix Sidecar</name> <name>Spring Cloud Netflix Sidecar</name>
<url>http://projects.spring.io/spring-cloud/</url> <url>http://projects.spring.io/spring-cloud/</url>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<name>Spring Cloud Netflix Turbine AMQP</name> <name>Spring Cloud Netflix Turbine AMQP</name>
<description>Spring Cloud Netflix Turbine AMQP</description> <description>Spring Cloud Netflix Turbine AMQP</description>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir>
<rxjava.version>[1.0,1.1)</rxjava.version> <rxjava.version>[1.0,1.1)</rxjava.version>
<turbine.version>2.0.0-DP.2</turbine.version> <turbine.version>2.0.0-DP.2</turbine.version>
</properties> </properties>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<name>Spring Cloud Netflix Turbine</name> <name>Spring Cloud Netflix Turbine</name>
<url>http://projects.spring.io/spring-cloud/</url> <url>http://projects.spring.io/spring-cloud/</url>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir>
<turbine.version>1.0.0</turbine.version> <turbine.version>1.0.0</turbine.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment