Repository: cayenne Updated Branches: refs/heads/master bddc400b9 -> 85316fd29
Deprecated DPCP2 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7f6908c7 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7f6908c7 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7f6908c7 Branch: refs/heads/master Commit: 7f6908c74d9241fb5e68d82a3793cab267629493 Parents: b83cc3e Author: Arseni Bulatski <ancars...@gmail.com> Authored: Fri Jan 26 17:55:01 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Fri Jan 26 17:55:01 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + UPGRADE.txt | 1 + .../apache/cayenne/configuration/server/DBCPDataSourceFactory.java | 2 ++ 3 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4f15920..57bf788 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,6 +20,7 @@ CAY-2393 Add sqlserver-docker profile to automate tests on SQLServer CAY-2394 Upgrade to Apache Velocity 2.0 CAY-2395 cdbimport: add option to create project file CAY-2396 Upgrade maven-assembly-plugin to 3.1.0 +CAY-2400 Cayenne-DBCP2 was deprecated Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/UPGRADE.txt ---------------------------------------------------------------------- diff --git a/UPGRADE.txt b/UPGRADE.txt index 0c9fc00..6b2f3d1 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -5,6 +5,7 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your current release and the release you are upgrading to. ------------------------------------------------------------------------------- UPGRADING TO 4.1.M2 +* Per CAY-2400 Cayenne-DBCP2 was deprecated * Per CAY-2377 All code deprecated in Cayenne 4.0 was removed, please review your code before upgrading. http://git-wip-us.apache.org/repos/asf/cayenne/blob/7f6908c7/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java index 54d3a6d..6a4cf24 100644 --- a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java +++ b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java @@ -33,7 +33,9 @@ import org.slf4j.LoggerFactory; /** * A {@link DataSourceFactory} based on DBCP2 connection pool library. + * @deprecated since 4.1 */ +@Deprecated public class DBCPDataSourceFactory implements DataSourceFactory { private static final String DBCP2_PROPERTIES = "dbcp2.properties";
