coheigea commented on code in PR #192:
URL:
https://github.com/apache/santuario-xml-security-java/pull/192#discussion_r1281614042
##########
pom.xml:
##########
@@ -95,46 +95,52 @@
<clirr.version>2.8</clirr.version>
<commons.codec.version>1.15</commons.codec.version>
<hamcrest.version>2.2</hamcrest.version>
- <jetty.version>9.4.51.v20230217</jetty.version>
+ <jaxb.runtime>4.0.3</jaxb.runtime>
+ <jetty.version>11.0.15</jetty.version>
+ <jmh.version>1.36</jmh.version>
<junit.version>5.10.0</junit.version>
- <log4j.version>2.20.0</log4j.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <jetty.version>11.0.15</jetty.version>
+ <junit.version>5.9.3</junit.version>
+ <slf4j.version>2.0.7</slf4j.version>
<xalan.version>2.7.3</xalan.version>
<xmlunit.version>2.9.1</xmlunit.version>
- <xml.bind.api.version>3.0.1</xml.bind.api.version>
- <xml.bind.impl.version>3.0.2</xml.bind.impl.version>
+ <xml.bind.api.version>4.0.0</xml.bind.api.version>
<woodstox.core.version>6.5.1</woodstox.core.version>
- <maven.compiler.target>1.8</maven.compiler.target>
+
<project.build.outputTimestamp>2023-06-16T19:00:00Z</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
<project.build.outputTimestamp>2023-03-27T06:33:07Z</project.build.outputTimestamp>
- <targetJdk>1.8</targetJdk>
- <test.logging.level>info</test.logging.level>
<!-- Allow Clirr severity to be overriden by the command-line option
-DminSeverity=level -->
<minSeverity>info</minSeverity>
<xmlsec.jaxb.context.class />
+
+ <!-- Important for FuncHere.java aka here() -->
+ <maven.test.argLine>
+ -Dfile.encoding=UTF-8
+
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
+ --add-exports
org.apache.santuario.xmlsec/org.apache.xml.security.test.dom.utils.jmh_generated=ALL-UNNAMED
+ --add-exports
org.apache.santuario.xmlsec/org.apache.xml.security.test.dom.xalan=ALL-UNNAMED
+ --add-exports
org.apache.santuario.xmlsec/org.apache.xml.security.test.stax.performance.jmh_generated=ALL-UNNAMED
+ </maven.test.argLine>
+ <skipUT>false</skipUT>
+ <skipIT>true</skipIT>
+ <test.logging.level>INFO</test.logging.level>
</properties>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.1</version>
Review Comment:
Put the version in a variable same as the others
##########
pom.xml:
##########
@@ -95,46 +95,52 @@
<clirr.version>2.8</clirr.version>
<commons.codec.version>1.15</commons.codec.version>
<hamcrest.version>2.2</hamcrest.version>
- <jetty.version>9.4.51.v20230217</jetty.version>
+ <jaxb.runtime>4.0.3</jaxb.runtime>
+ <jetty.version>11.0.15</jetty.version>
+ <jmh.version>1.36</jmh.version>
<junit.version>5.10.0</junit.version>
- <log4j.version>2.20.0</log4j.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <jetty.version>11.0.15</jetty.version>
+ <junit.version>5.9.3</junit.version>
Review Comment:
We already have junit 5.10.0 above?
##########
pom.xml:
##########
@@ -442,32 +477,72 @@
<version>3.1.0</version>
<configuration>
<reportFormat>brief</reportFormat>
- <!-- We need to reinitialize classes based on the
configuration -->
- <reuseForks>false</reuseForks>
<includes>
<include>**/*Test.java</include>
</includes>
- <excludes>
- <exclude>**/PerformanceMemoryTest.java</exclude>
- <exclude>**/PerformanceTimingTest.java</exclude>
- </excludes>
+ <excludedGroups>benchmark</excludedGroups>
+ <!-- We need to reinitialize classes based on the
configuration -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ <forkNode
implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"
/>
<!-- @{argLine} is generated by jacoco-prepare -->
- <argLine>@{argLine}</argLine>
+ <argLine>${maven.test.argLine} @{argLine}</argLine>
+ <skipExec>${skipUT}</skipExec>
<systemPropertyVariables>
<product.version>${project.version}</product.version>
<log4j.configurationFile>${project.build.testOutputDirectory}/log4j2.xml</log4j.configurationFile>
<!--<jakarta.xml.bind.JAXBContext>${xmlsec.jaxb.context.class}</jakarta.xml.bind.JAXBContext>-->
<javax.xml.accessExternalDTD>file</javax.xml.accessExternalDTD>
<org.apache.xml.security.securerandom.algorithm>SHA1PRNG</org.apache.xml.security.securerandom.algorithm>
+ <file.encoding>UTF-8</file.encoding>
</systemPropertyVariables>
+ <environmentVariables>
+ <LANG>en_US.UTF-8</LANG>
+ <LANGUAGE>en_US:us</LANGUAGE>
+ </environmentVariables>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ <argLine>${maven.test.argLine}</argLine>
+ <skipExec>${skipIT}</skipExec>
+ <groups>benchmark</groups>
+ <forkCount>1</forkCount>
+ <forkNode
implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"
/>
+ <systemPropertyVariables>
+ <product.version>${project.version}</product.version>
+
<javax.xml.accessExternalDTD>file</javax.xml.accessExternalDTD>
+
<org.apache.xml.security.securerandom.algorithm>SHA1PRNG</org.apache.xml.security.securerandom.algorithm>
+ <file.encoding>UTF-8</file.encoding>
+ </systemPropertyVariables>
+ <environmentVariables>
+ <LANG>en_US.UTF-8</LANG>
+ <LANGUAGE>en_US:us</LANGUAGE>
+ </environmentVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>2.6.0</version>
<configuration>
- <javaVersion>${targetJdk}</javaVersion>
Review Comment:
Couldn't we just keep targetJdk and change to 11?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
