Merge branch '1.2.x'

pull/4140/head
Phillip Webb 9 years ago
commit 04074fece1

@ -169,16 +169,22 @@ easier to navigate.
==== Manual installation with m2eclipse
If you prefer to install Eclipse yourself we recommend that you use the
http://eclipse.org/m2e/[m2eclipe] eclipse plugin. If you don't already have m2eclipse
installed it is available from the "eclipse marketplace".
installed it is available from the "Eclipse marketplace".
Spring Boot includes project specific source formatting settings, in order to have these
work with m2eclipse, we provide an additional eclipse plugin that you can install:
work with m2eclipse, we provide additional Eclipse plugins that you can install:
===== Install the m2eclipse-maveneclipse plugin
* Select "`Help`" -> "`Install New Software`".
* Add `https://dl.bintray.com/philwebb/m2eclipse-maveneclipse` as a site.
* Install "Maven Integration for the maven-eclipse-plugin"
NOTE: This plugin is optional. Projects can be imported without the plugin, your code
===== Install the Spring Formatter plugin
* Select "`Help`" -> "`Install New Software`".
* Add `https://dl.bintray.com/philwebb/spring-eclipse-code-formatter/` as a site.
* Install "Spring Code Formatter"
NOTE: These plugins are optional. Projects can be imported without the plugins, your code
changes just won't be automatically formatted.
With the requisite eclipse plugins installed you can select

@ -388,3 +388,4 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.springframework.ide.eclipse.jdt.formatter.javaformatter

@ -18,4 +18,3 @@
* Actuator auditing listeners.
*/
package org.springframework.boot.actuate.audit.listener;

@ -18,4 +18,3 @@
* Core actuator auditing classes.
*/
package org.springframework.boot.actuate.audit;

@ -18,4 +18,3 @@
* Auto-configuration for the actuator.
*/
package org.springframework.boot.actuate.autoconfigure;

@ -18,4 +18,3 @@
* Actuator JMX endpoint support.
*/
package org.springframework.boot.actuate.endpoint.jmx;

@ -18,4 +18,3 @@
* Actuator Spring MVC endpoint support.
*/
package org.springframework.boot.actuate.endpoint.mvc;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.endpoint.Endpoint
*/
package org.springframework.boot.actuate.endpoint;

@ -18,4 +18,3 @@
* Actuator health indicators.
*/
package org.springframework.boot.actuate.health;

@ -18,4 +18,3 @@
* Metrics export support.
*/
package org.springframework.boot.actuate.metrics.export;

@ -18,4 +18,3 @@
* Core metrics classes.
*/
package org.springframework.boot.actuate.metrics;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.reader.MetricReader
*/
package org.springframework.boot.actuate.metrics.reader;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.repository.MetricRepository
*/
package org.springframework.boot.actuate.metrics.repository;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.repository.redis.RedisMetricRepository
*/
package org.springframework.boot.actuate.metrics.repository.redis;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.rich.RichGauge
*/
package org.springframework.boot.actuate.metrics.rich;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.rich.RichGauge
*/
package org.springframework.boot.actuate.metrics.util;

@ -18,4 +18,3 @@
* Support for writing metrics.
*/
package org.springframework.boot.actuate.metrics.writer;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.metrics.rich.RichGauge
*/
package org.springframework.boot.actuate.security;

@ -18,4 +18,3 @@
* General actuator system support classes.
*/
package org.springframework.boot.actuate.system;

@ -20,4 +20,3 @@
* @see org.springframework.boot.actuate.trace.TraceRepository
*/
package org.springframework.boot.actuate.trace;

@ -18,4 +18,3 @@
* Auto-configuration for RabbitMQ.
*/
package org.springframework.boot.autoconfigure.amqp;

@ -18,4 +18,3 @@
* Auto-configuration for Spring AOP.
*/
package org.springframework.boot.autoconfigure.aop;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Batch.
*/
package org.springframework.boot.autoconfigure.batch;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Cloud Connectors.
*/
package org.springframework.boot.autoconfigure.cloud;

@ -18,4 +18,3 @@
* {@code @Condition} annotations and supporting classes.
*/
package org.springframework.boot.autoconfigure.condition;

@ -18,4 +18,3 @@
* Auto-configuration for Spring DAO.
*/
package org.springframework.boot.autoconfigure.dao;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data Elasticsearch.
*/
package org.springframework.boot.autoconfigure.data.elasticsearch;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data JPA.
*/
package org.springframework.boot.autoconfigure.data.jpa;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data Mongo.
*/
package org.springframework.boot.autoconfigure.data.mongo;

@ -18,4 +18,3 @@
* Auto-configuration base classes for Spring Data.
*/
package org.springframework.boot.autoconfigure.data;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data REST.
*/
package org.springframework.boot.autoconfigure.data.rest;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data SOLR.
*/
package org.springframework.boot.autoconfigure.data.solr;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Data's Web Support.
*/
package org.springframework.boot.autoconfigure.data.web;

@ -18,4 +18,3 @@
* Auto-configuration for Flyway.
*/
package org.springframework.boot.autoconfigure.flyway;

@ -18,4 +18,3 @@
* Auto-configuration for Freemarker.
*/
package org.springframework.boot.autoconfigure.freemarker;

@ -18,4 +18,3 @@
* Auto-configuration for Groovy templates.
*/
package org.springframework.boot.autoconfigure.groovy.template;

@ -18,4 +18,3 @@
* Auto-configuration for GSON.
*/
package org.springframework.boot.autoconfigure.gson;

@ -18,4 +18,3 @@
* Auto-configuration for Spring HATEOAS.
*/
package org.springframework.boot.autoconfigure.hateoas;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Integration.
*/
package org.springframework.boot.autoconfigure.integration;

@ -18,4 +18,3 @@
* Auto-configuration for Jackson.
*/
package org.springframework.boot.autoconfigure.jackson;

@ -18,4 +18,3 @@
* Auto-configuration for JDBC Metadata.
*/
package org.springframework.boot.autoconfigure.jdbc.metadata;

@ -18,4 +18,3 @@
* Auto-configuration for JDBC.
*/
package org.springframework.boot.autoconfigure.jdbc;

@ -18,4 +18,3 @@
* Auto-configuration for Jersey.
*/
package org.springframework.boot.autoconfigure.jersey;

@ -18,4 +18,3 @@
* Auto-configuration for ActiveMQ.
*/
package org.springframework.boot.autoconfigure.jms.activemq;

@ -18,4 +18,3 @@
* Auto-configuration for HornetQ.
*/
package org.springframework.boot.autoconfigure.jms.hornetq;

@ -18,4 +18,3 @@
* Auto-configuration for JMS.
*/
package org.springframework.boot.autoconfigure.jms;

@ -18,4 +18,3 @@
* Auto-configuration for JMX.
*/
package org.springframework.boot.autoconfigure.jmx;

@ -18,4 +18,3 @@
* Auto-configuration for Liquibase.
*/
package org.springframework.boot.autoconfigure.liquibase;

@ -18,4 +18,3 @@
* Auto-configuration for logging.
*/
package org.springframework.boot.autoconfigure.logging;

@ -18,4 +18,3 @@
* Auto-configuration for email support.
*/
package org.springframework.boot.autoconfigure.mail;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Mobile.
*/
package org.springframework.boot.autoconfigure.mobile;

@ -18,4 +18,3 @@
* Auto-configuration for MongoDB.
*/
package org.springframework.boot.autoconfigure.mongo;

@ -18,4 +18,3 @@
* Auto-configuration for Mustache.
*/
package org.springframework.boot.autoconfigure.mustache;

@ -18,4 +18,3 @@
* Auto-configuration for Mustache with Spring MVC.
*/
package org.springframework.boot.autoconfigure.mustache.web;

@ -18,4 +18,3 @@
* Auto-configuration for JPA and Spring ORM.
*/
package org.springframework.boot.autoconfigure.orm.jpa;

@ -20,4 +20,3 @@
* @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
*/
package org.springframework.boot.autoconfigure;

@ -18,4 +18,3 @@
* Auto-configuration for Project Reactor.
*/
package org.springframework.boot.autoconfigure.reactor;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Security.
*/
package org.springframework.boot.autoconfigure.security;

@ -18,4 +18,3 @@
* Auto-configuration for Spring Social.
*/
package org.springframework.boot.autoconfigure.social;

@ -18,4 +18,3 @@
* Auto-configuration for Solr.
*/
package org.springframework.boot.autoconfigure.solr;

@ -18,4 +18,3 @@
* Base classes for template Auto-configuration.
*/
package org.springframework.boot.autoconfigure.template;

@ -18,4 +18,3 @@
* Test utilities related to auto-configuration.
*/
package org.springframework.boot.autoconfigure.test;

@ -18,4 +18,3 @@
* Auto-configuration for Thymeleaf.
*/
package org.springframework.boot.autoconfigure.thymeleaf;

@ -18,4 +18,3 @@
* Auto-configuration for Velocity.
*/
package org.springframework.boot.autoconfigure.velocity;

@ -18,4 +18,3 @@
* Auto-configuration for embedded servlet containers and Spring MVC.
*/
package org.springframework.boot.autoconfigure.web;

@ -18,4 +18,3 @@
* Auto-configuration for Spring WebSocket.
*/
package org.springframework.boot.autoconfigure.websocket;

@ -19,4 +19,3 @@
* @see org.springframework.boot.cli.command.jar.JarCommand
*/
package org.springframework.boot.cli.jar;

@ -20,4 +20,3 @@
* we want to extract into a separate jar at a future date.
*/
package org.springframework.boot.groovy;

@ -1,3 +1,4 @@
/*
* Copyright 2012-2015 the original author or authors.
*
@ -18,4 +19,3 @@
* Spring Boot developer tools.
*/
package org.springframework.boot.devtools;

@ -18,4 +18,3 @@
* Tools for generating executable JAR/WAR files.
*/
package org.springframework.boot.loader.tools;

@ -21,4 +21,3 @@
* @see org.springframework.boot.loader.archive.Archive
*/
package org.springframework.boot.loader.archive;

@ -20,4 +20,3 @@
* @see org.springframework.boot.loader.data.RandomAccessData
*/
package org.springframework.boot.loader.data;

@ -18,4 +18,3 @@
* Support for loading and manipulating JAR/WAR files.
*/
package org.springframework.boot.loader.jar;

@ -16,12 +16,11 @@
/**
* System that allows self-contained JAR/WAR archives to be launched using
* {@code java -jar}. Archives can include nested packaged dependency JARs (there is
* no need to create shade style jars) and are executed without unpacking. The only
* {@code java -jar}. Archives can include nested packaged dependency JARs (there is no
* need to create shade style jars) and are executed without unpacking. The only
* constraint is that nested JARs must be stored in the archive uncompressed.
*
* @see org.springframework.boot.loader.JarLauncher
* @see org.springframework.boot.loader.WarLauncher
*/
package org.springframework.boot.loader;

@ -18,4 +18,3 @@
* Utilities used by Spring Boot's JAR loading.
*/
package org.springframework.boot.loader.util;

@ -20,4 +20,3 @@
* @see org.springframework.boot.ansi.AnsiOutput
*/
package org.springframework.boot.ansi;

@ -21,4 +21,3 @@
* @see org.springframework.boot.bind.YamlConfigurationFactory
*/
package org.springframework.boot.bind;

@ -15,9 +15,9 @@
*/
/**
* Fluent 'builder' style API to construct a {@link org.springframework.boot.SpringApplication}.
* Fluent 'builder' style API to construct a
* {@link org.springframework.boot.SpringApplication}.
*
* @see org.springframework.boot.builder.SpringApplicationBuilder
*/
package org.springframework.boot.builder;

@ -15,10 +15,9 @@
*/
/**
* External configuration support allowing 'application.properties' to be loaded
* and used within a Spring Boot application.
* External configuration support allowing 'application.properties' to be loaded and used
* within a Spring Boot application.
*
* @see org.springframework.boot.context.config.ConfigFileEnvironmentPostProcessor
*/
package org.springframework.boot.context.config;

@ -15,9 +15,11 @@
*/
/**
* Support for Jetty {@link org.springframework.boot.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
* Support for Jetty
* {@link org.springframework.boot.context.embedded.EmbeddedServletContainer
* EmbeddedServletContainers}.
*
* @see org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory
* @see org.springframework.boot.context.embedded.jetty.
* JettyEmbeddedServletContainerFactory
*/
package org.springframework.boot.context.embedded.jetty;

@ -21,4 +21,3 @@
* @see org.springframework.boot.context.embedded.EmbeddedWebApplicationContext
*/
package org.springframework.boot.context.embedded;

@ -15,9 +15,11 @@
*/
/**
* Support for Tomcat {@link org.springframework.boot.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
* Support for Tomcat
* {@link org.springframework.boot.context.embedded.EmbeddedServletContainer
* EmbeddedServletContainers}.
*
* @see org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory
* @see org.springframework.boot.context.embedded.tomcat.
* TomcatEmbeddedServletContainerFactory
*/
package org.springframework.boot.context.embedded.tomcat;

@ -15,9 +15,11 @@
*/
/**
* Support for Undertow {@link org.springframework.boot.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
* Support for Undertow
* {@link org.springframework.boot.context.embedded.EmbeddedServletContainer
* EmbeddedServletContainers}.
*
* @see org.springframework.boot.context.embedded.undertow.UndertowEmbeddedServletContainerFactory
* @see org.springframework.boot.context.embedded.undertow.
* UndertowEmbeddedServletContainerFactory
*/
package org.springframework.boot.context.embedded.undertow;

@ -15,7 +15,7 @@
*/
/**
* {@link org.springframework.context.ApplicationEvent ApplicationEvents} triggered by Spring Boot.
* {@link org.springframework.context.ApplicationEvent ApplicationEvents} triggered by
* Spring Boot.
*/
package org.springframework.boot.context.event;

@ -18,4 +18,3 @@
* Classes related to Spring's {@link org.springframework.context.ApplicationContext}.
*/
package org.springframework.boot.context;

@ -15,10 +15,10 @@
*/
/**
* Support for external configuration binding via the {@code @ConfigurationProperties} annotation.
* Support for external configuration binding via the {@code @ConfigurationProperties}
* annotation.
*
* @see org.springframework.boot.context.properties.ConfigurationProperties
* @see org.springframework.boot.context.properties.EnableConfigurationProperties
*/
package org.springframework.boot.context.properties;

@ -19,4 +19,3 @@
* deployment.
*/
package org.springframework.boot.context.web;

@ -18,4 +18,3 @@
* Spring {@link org.springframework.core.env.Environment} support.
*/
package org.springframework.boot.env;

@ -20,4 +20,3 @@
* @see org.springframework.boot.json.JsonParser
*/
package org.springframework.boot.json;

@ -18,4 +18,3 @@
* Support classes for Atomikos JTA.
*/
package org.springframework.boot.jta.atomikos;

@ -18,4 +18,3 @@
* Support classes for Bitronix JTA.
*/
package org.springframework.boot.jta.bitronix;

@ -18,4 +18,3 @@
* Support for the Java Transaction API.
*/
package org.springframework.boot.jta;

@ -20,4 +20,3 @@
* @see org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener
*/
package org.springframework.boot.liquibase;

@ -18,4 +18,3 @@
* Support for 'Java Util Logging'.
*/
package org.springframework.boot.logging.java;

@ -18,4 +18,3 @@
* Support for the Log4j logging library.
*/
package org.springframework.boot.logging.log4j;

@ -18,4 +18,3 @@
* Support for the Log4j 2 logging library.
*/
package org.springframework.boot.logging.log4j2;

@ -18,4 +18,3 @@
* Support for the Logback logging library.
*/
package org.springframework.boot.logging.logback;

@ -20,4 +20,3 @@
* @see org.springframework.boot.logging.LoggingSystem
*/
package org.springframework.boot.logging;

@ -18,4 +18,3 @@
* Hibernate Support classes.
*/
package org.springframework.boot.orm.jpa.hibernate;

@ -18,4 +18,3 @@
* JPA Support classes.
*/
package org.springframework.boot.orm.jpa;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save