From f2f4018b623e2af4557b53ae2080b715e7fb4369 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 27 May 2024 14:05:02 -0400 Subject: [PATCH 1/3] [mvn] Update maven wrapper --- .mvn/wrapper/MavenWrapperDownloader.java | 2 +- .mvn/wrapper/maven-wrapper.properties | 5 +++-- mvnw | 6 +++--- mvnw.cmd | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index f6cb0fa0..bdf0ddfa 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -30,7 +30,7 @@ import java.util.concurrent.ThreadLocalRandom; public final class MavenWrapperDownloader { - private static final String WRAPPER_VERSION = "3.3.1"; + private static final String WRAPPER_VERSION = "3.3.2"; private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE")); diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 34d54388..38e7a931 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.1 +wrapperVersion=3.3.2 +distributionType=source distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/mvnw b/mvnw index b21a698e..66838882 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.1 +# Apache Maven Wrapper startup batch script, version 3.3.2 # # Required ENV vars: # ------------------ @@ -212,9 +212,9 @@ else log "Couldn't find $wrapperJarPath, downloading it ..." if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" fi while IFS="=" read -r key value; do # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) diff --git a/mvnw.cmd b/mvnw.cmd index f93f29a8..da4fe4dd 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.1 +@REM Apache Maven Wrapper startup batch script, version 3.3.2 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B @@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.1/maven-wrapper-3.3.1.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... From 9155fb9e7b8db218c6688e502eb82ee79b9b9ffe Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 27 May 2024 14:32:20 -0400 Subject: [PATCH 2/3] [c3p0] Bump to 0.10.1 and drop support for proxy reflection as dropped from c3p0 --- pom.xml | 2 +- .../datasource/c3p0/C3p0DataSourceProvider.java | 14 +------------- src/site/xdoc/datasources/c3p0.xml | 7 +------ .../c3p0/C3p0DataSourceProviderTest.java | 10 +--------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 07dc9f0d..4d06ed21 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ com.mchange c3p0 - 0.10.0-pre3 + 0.10.1 true diff --git a/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java index c48a3bad..9ac1cf81 100644 --- a/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java +++ b/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2023 the original author or authors. + * Copyright 2009-2024 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. @@ -371,18 +371,6 @@ public void setUnreturnedConnectionTimeout( dataSource.setUnreturnedConnectionTimeout(unreturnedConnectionTimeout); } - /** - * Sets the uses traditional reflective proxies. - * - * @param usesTraditionalReflectiveProxies - * the new uses traditional reflective proxies - */ - @com.google.inject.Inject(optional = true) - public void setUsesTraditionalReflectiveProxies( - @Named("c3p0.usesTraditionalReflectiveProxies") final boolean usesTraditionalReflectiveProxies) { - dataSource.setUsesTraditionalReflectiveProxies(usesTraditionalReflectiveProxies); - } - @Override public DataSource get() { if (username != null) { diff --git a/src/site/xdoc/datasources/c3p0.xml b/src/site/xdoc/datasources/c3p0.xml index b34c1f7d..cbb3fd07 100644 --- a/src/site/xdoc/datasources/c3p0.xml +++ b/src/site/xdoc/datasources/c3p0.xml @@ -1,7 +1,7 @@