Merge pull request spring-projects#4917 from eddumelendez/spring-proj…

…ectsgh-4905

* pr/4917:
  Polish contribution
  Remove support for Log4j
  Remove deprecated code

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/DataEndpointMBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,18 +32,6 @@
 @ManagedResource
 public class DataEndpointMBean extends EndpointMBean {
 
-	/**
-	 * Create a new {@link DataEndpointMBean} instance.
-	 * @param beanName the bean name
-	 * @param endpoint the endpoint to wrap
-	 * @deprecated since 1.3 in favor of
-	 * {@link #DataEndpointMBean(String, Endpoint, ObjectMapper)}
-	 */
-	@Deprecated
-	public DataEndpointMBean(String beanName, Endpoint<?> endpoint) {
-		super(beanName, endpoint);
-	}
-
 	/**
 	 * Create a new {@link DataEndpointMBean} instance.
 	 * @param beanName the bean name

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,18 +40,6 @@ public class EndpointMBean {
 
 	private final ObjectMapper mapper;
 
-	/**
-	 * Create a new {@link EndpointMBean} instance.
-	 * @param beanName the bean name
-	 * @param endpoint the endpoint to wrap
-	 * @deprecated since 1.3 in favor of
-	 * {@link #EndpointMBean(String, Endpoint, ObjectMapper)}
-	 */
-	@Deprecated
-	public EndpointMBean(String beanName, Endpoint<?> endpoint) {
-		this(beanName, endpoint, new ObjectMapper());
-	}
-
 	/**
 	 * Create a new {@link EndpointMBean} instance.
 	 * @param beanName the bean name

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/ShutdownEndpointMBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,18 +32,6 @@
 @ManagedResource
 public class ShutdownEndpointMBean extends EndpointMBean {
 
-	/**
-	 * Create a new {@link ShutdownEndpointMBean} instance.
-	 * @param beanName the bean name
-	 * @param endpoint the endpoint to wrap
-	 * @deprecated since 1.3 in favor of
-	 * {@link #ShutdownEndpointMBean(String, Endpoint, ObjectMapper)}
-	 */
-	@Deprecated
-	public ShutdownEndpointMBean(String beanName, Endpoint<?> endpoint) {
-		super(beanName, endpoint);
-	}
-
 	/**
 	 * Create a new {@link ShutdownEndpointMBean} instance.
 	 * @param beanName the bean name

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java

@@ -62,17 +62,6 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
 
 	private final TraceProperties properties;
 
-	/**
-	 * Create a new {@link WebRequestTraceFilter} instance.
-	 * @param traceRepository the trace repository.
-	 * @deprecated since 1.3.0 in favor of
-	 * {@link #WebRequestTraceFilter(TraceRepository, TraceProperties)}
-	 */
-	@Deprecated
-	public WebRequestTraceFilter(TraceRepository traceRepository) {
-		this(traceRepository, new TraceProperties());
-	}
-
 	/**
 	 * Create a new {@link WebRequestTraceFilter} instance.
 	 * @param repository the trace repository

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingClass.java

@@ -42,12 +42,4 @@
 	 */
 	String[] value() default {};
 
-	/**
-	 * An alias for {@link #value} specifying the names of the classes that must not be
-	 * present.
-	 * @return the class names that must not be present.
-	 * @deprecated since 1.3.0 in favor of {@link #value}.
-	 */
-	String[] name() default {};
-
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java

@@ -181,21 +181,6 @@ public String getMongoClientDatabase() {
 		return new MongoClientURI(this.uri).getDatabase();
 	}
 
-	/**
-	 * Creates a {@link MongoClient} using the given {@code options}.
-	 *
-	 * @param options the options
-	 * @return the Mongo client
-	 * @throws UnknownHostException if the configured host is unknown
-	 * @deprecated Since 1.3.0 in favour of
-	 * {@link #createMongoClient(MongoClientOptions, Environment)}
-	 */
-	@Deprecated
-	public MongoClient createMongoClient(MongoClientOptions options)
-			throws UnknownHostException {
-		return this.createMongoClient(options, null);
-	}
-
 	/**
 	 * Creates a {@link MongoClient} using the given {@code options} and
 	 * {@code environment}. If the configured port is zero, the value of the