This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-parser.git
commit b8c6c41c8baf01a5067e1b3b8ee376ee5ada07e1
Author: Georg Kallidis <g...@apache.org>
AuthorDate: Tue Sep 26 15:55:45 2023 +0200
Update changes.xml, remove snapshots, minor code fixes
---
pom.xml | 12 +++++++++---
src/changes/changes.xml | 14 ++++++++++++--
.../apache/fulcrum/parser/DefaultParserService.java | 3 ++-
src/test/log4j2-test.xml | 18 ++++++++++--------
4 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa4a2e7..ab50c89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.9</version>
+ <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -144,6 +144,13 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>
+ <!-- log4j2 only usable in testcontainer 1.0.10 -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -153,8 +160,7 @@
<testResource>
<directory>${basedir}/src/test</directory>
<includes>
- <include>*.java</include>
- <include>log4j2*.xml</include>
+ <include>**</include>
</includes>
</testResource>
</testResources>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 416bc46..baf9ba0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,8 +22,18 @@
</properties>
<body>
- <release version="2.0.1" date="in SVN">
- <action dev="gk" type="update" date="2019-25-06">
+ <release version="3.0.0" date="in GIT">
+ <action dev="gk" type="update" date="2023-08-02">
+ - Use maxWait Duration on pool2
+ - major update fulcrum yaafi to 2.0.0
+ - minor update commons-lang3 to 3.13.0
+ </action>
+ <action dev="gk" type="update" date="2022-20-10">
+ - minor update commons pool2 version to 2.11.1
+ - commons-pool2 is now scope provided to avoid dependency
inconsistencies with commons module dbcp2
+ - java 11 baseline
+ </action>
+ <action dev="gk" type="update" date="2019-25-06">
- use optional Fulcrum Pool (without Recycable feature) again as
fallback
- fix bug in parser resources (using new dispose method from
ValueParser instead of same method in Fulcrum Pool Recycable
- add + fix tests
diff --git a/src/java/org/apache/fulcrum/parser/DefaultParserService.java
b/src/java/org/apache/fulcrum/parser/DefaultParserService.java
index 4ed7932..1816ec6 100644
--- a/src/java/org/apache/fulcrum/parser/DefaultParserService.java
+++ b/src/java/org/apache/fulcrum/parser/DefaultParserService.java
@@ -513,7 +513,8 @@ public class DefaultParserService
valueParserPool.setConfig(genObjPoolConfig);
parameterParserPool.setConfig(genObjPoolConfig);
cookieParserPool.setConfig(genObjPoolConfig);
-
+
+ getLogger().info("Update Config Commons2 Pools with " +
genObjPoolConfig );
getLogger().debug(valueParserPool.toString());
getLogger().debug(parameterParserPool.toString());
getLogger().debug(cookieParserPool.toString());
diff --git a/src/test/log4j2-test.xml b/src/test/log4j2-test.xml
index 897e0eb..b7e9a13 100644
--- a/src/test/log4j2-test.xml
+++ b/src/test/log4j2-test.xml
@@ -17,17 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<Configuration status="trace" verbose="true">
+<Configuration status="info" verbose="false">
<Appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </Console>
- <File name="logfile" fileName="target/fulcrum-parser-test.log">
+ </Console>
+ <File name="logfile" fileName="./target/fulcrum-parser-test.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </File>
- <File name="avalon" fileName="target/avalon-test.log">
+ </File>
+ <File name="avalon" fileName="./target/avalon-test.log">
<PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </File>
+ </File>
</Appenders>
<Loggers>
<Logger name="org.apache.fulcrum" level="debug" additivity="false">
@@ -35,9 +35,10 @@
<AppenderRef ref="logfile"/>
</Logger>
<Logger name="org.apache.fulcrum.parser" level="debug"
additivity="false">
- <AppenderRef ref="avalon"/>
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="logfile"/>
</Logger>
- <Logger name="avalon" level="debug" additivity="info">
+ <Logger name="avalon" level="info" additivity="false">
<AppenderRef ref="avalon"/>
</Logger>
<Logger name="org.apache.logging.log4j" level="info" additivity="false">
@@ -45,6 +46,7 @@
</Logger>
<Root level="error">
<AppenderRef ref="console"/>
+ <AppenderRef ref="logfile"/>
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
