Repository: logging-log4j2 Updated Branches: refs/heads/master d43d301fc -> da86b041e
Add missing @Deprecated annotations. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/da86b041 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/da86b041 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/da86b041 Branch: refs/heads/master Commit: da86b041ef94e58140f3ebc6e32b4e3e980303ec Parents: d43d301 Author: Gary Gregory <[email protected]> Authored: Tue Jan 16 23:01:00 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Tue Jan 16 23:01:00 2018 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java | 2 ++ .../logging/log4j/core/net/ssl/TrustStoreConfiguration.java | 1 + .../org/apache/logging/log4j/core/tools/picocli/CommandLine.java | 3 +++ .../java/org/apache/logging/log4j/mongodb/MongoDbProvider.java | 1 + 4 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da86b041/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java index d0c7bb0..0c9e3ce 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java @@ -54,6 +54,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration { * @throws StoreConfigurationException Thrown if this instance cannot load the KeyStore. * @deprecated use {@link #KeyStoreConfiguration(String, PasswordProvider, String, String)} instead */ + @Deprecated public KeyStoreConfiguration(final String location, final char[] password, final String keyStoreType, @@ -125,6 +126,7 @@ public class KeyStoreConfiguration extends AbstractKeyStoreConfiguration { /** * @deprecated use {@link #createKeyStoreConfiguration(String, char[], String, String, String, String)} */ + @Deprecated public static KeyStoreConfiguration createKeyStoreConfiguration( // @formatter:off final String location, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da86b041/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java index d884aed..b5c282b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java @@ -115,6 +115,7 @@ public class TrustStoreConfiguration extends AbstractKeyStoreConfiguration { /** * @deprecated Use {@link #createKeyStoreConfiguration(String, char[], String, String, String, String)} */ + @Deprecated public static TrustStoreConfiguration createKeyStoreConfiguration( // @formatter:off final String location, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da86b041/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java index f73b2aa..a4cc8d2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java @@ -3010,6 +3010,7 @@ public class CommandLine { * @see #detailedSynopsis(Comparator, boolean) * @deprecated use {@link #synopsis(int)} instead */ + @Deprecated public String synopsis() { return synopsis(0); } /** @@ -3049,6 +3050,7 @@ public class CommandLine { * @param clusterBooleanOptions {@code true} if boolean short options should be clustered into a single string * @return a detailed synopsis * @deprecated use {@link #detailedSynopsis(int, Comparator, boolean)} instead. */ + @Deprecated public String detailedSynopsis(Comparator<Field> optionSort, boolean clusterBooleanOptions) { return detailedSynopsis(0, optionSort, clusterBooleanOptions); } @@ -3967,6 +3969,7 @@ public class CommandLine { * @param col the column of the cell whose Text to return * @return the Text object at the specified row and column * @deprecated use {@link #textAt(int, int)} instead */ + @Deprecated public Text cellAt(int row, int col) { return textAt(row, col); } /** Returns the current number of rows of this {@code TextTable}. http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/da86b041/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java ---------------------------------------------------------------------- diff --git a/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java index f7077b3..420759a 100644 --- a/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java +++ b/log4j-mongodb/src/main/java/org/apache/logging/log4j/mongodb/MongoDbProvider.java @@ -105,6 +105,7 @@ public final class MongoDbProvider implements NoSqlProvider<MongoDbConnection> { * @return a new MongoDB provider. * @deprecated in 2.8; use {@link #newBuilder()} instead. */ + @Deprecated @PluginFactory public static MongoDbProvider createNoSqlProvider( final String collectionName,
