Skip to content

Commit

Permalink
Release XLT 6.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@jowerner
jowerner committed Aug 19, 2022
2 parents 126e8e8 + 5115d8c commit e040806
Show file tree
Hide file tree
Showing 21 changed files with 1,011 additions and 736 deletions.
2 changes: 1 addition & 1 deletion bin/agent.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set JAVA_OPTIONS=
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -Djava.endorsed.dirs="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.agent.home="%AGENT_HOME%"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j2.configurationFile="%AGENT_CONFIG_DIR%\log4j2.properties"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j2.configurationFile="%AGENT_CONFIG_DIR%\log4j2.properties","%AGENT_CONFIG_DIR%\log4j2.xml"
set JAVA_OPTIONS=%JAVA_OPTIONS% -Dorg.apache.xml.dtm.DTMManager=org.apache.xml.dtm.ref.DTMManagerDefault
rem set JAVA_OPTIONS=%JAVA_OPTIONS% -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n
set JAVA_OPTIONS=%JAVA_OPTIONS% -cp "%CLASSPATH%"
Expand Down
2 changes: 1 addition & 1 deletion bin/agent.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ JAVA_OPTIONS=
#JAVA_OPTIONS="$JAVA_OPTIONS -Djava.endorsed.dirs=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.agent.home=\"$AGENT_HOME\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j2.configurationFile=\"$AGENT_CONFIG_DIR/log4j2.properties\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j2.configurationFile=\"$AGENT_CONFIG_DIR/log4j2.properties\",\"$AGENT_CONFIG_DIR/log4j2.xml\""
JAVA_OPTIONS="$JAVA_OPTIONS -Dorg.apache.xml.dtm.DTMManager=org.apache.xml.dtm.ref.DTMManagerDefault"
#JAVA_OPTIONS="$JAVA_OPTIONS -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n"
JAVA_OPTIONS="$JAVA_OPTIONS -cp \"$CLASSPATH\""
Expand Down
103 changes: 59 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.xceptance</groupId>
<artifactId>xlt</artifactId>
<version>6.2.2</version>
<version>6.2.3</version>
<packaging>jar</packaging>

<name>XLT</name>
Expand Down Expand Up @@ -65,10 +65,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<asm.version>7.1</asm.version>
<asm.version>9.3</asm.version>
<httpclient.version>4.5.13</httpclient.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<log4j.version>2.17.1</log4j.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<log4j.version>2.18.0</log4j.version>
<powermock.version>2.0.9</powermock.version>
<copyright>Copyright (c) ${project.inceptionYear}-2022 ${project.organization.name}</copyright>
</properties>
Expand All @@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
Expand All @@ -91,23 +91,27 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<version>4.1</version>
<configuration>
<header>src/build/resources/license-header.txt</header>
<properties>
<copyright>${copyright}</copyright>
</properties>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<!-- These have their own license header. -->
<exclude>src/main/java/com/gargoylesoftware/**/*</exclude>
<exclude>src/main/java/com/xceptance/xlt/engine/xltdriver/**/*</exclude>
<exclude>src/main/java/com/xceptance/xlt/report/util/NoOverlapCategoryAxis.java</exclude>
<exclude>src/main/java/netscape/**/*</exclude>
<exclude>src/test-hu/**/*</exclude>
</excludes>
<licenseSets>
<licenseSet>
<header>src/build/resources/license-header.txt</header>
<properties>
<copyright>${copyright}</copyright>
</properties>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<!-- These have their own license header. -->
<exclude>src/main/java/com/gargoylesoftware/**/*</exclude>
<exclude>src/main/java/com/xceptance/xlt/engine/xltdriver/**/*</exclude>
<exclude>src/main/java/com/xceptance/xlt/report/util/NoOverlapCategoryAxis.java</exclude>
<exclude>src/main/java/netscape/**/*</exclude>
<exclude>src/test-hu/**/*</exclude>
</excludes>
</licenseSet>
</licenseSets>
<mapping>
<java>SLASHSTAR_STYLE</java>
</mapping>
Expand All @@ -121,7 +125,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -162,7 +166,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit-cssparser</artifactId>
<version>1.7.0</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -177,7 +181,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>neko-htmlunit</artifactId>
<version>2.50.0</version>
<version>2.62.0</version>
<exclusions>
<!-- already provided by Java 11 -->
<exclusion>
Expand Down Expand Up @@ -215,7 +219,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-ec2</artifactId>
<version>1.12.145</version>
<version>1.12.279</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -226,17 +230,22 @@
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-compute</artifactId>
<version>v1-rev235-1.25.0</version>
<version>v1-rev20220720-1.32.1</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
<version>1.42.2</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.4</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.7</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -246,7 +255,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.6.0</version>
<version>2.9.0</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -257,12 +266,12 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<version>4.0.63</version>
<version>4.0.66</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
Expand All @@ -289,12 +298,12 @@
<!-- optional dependency of dnsjava, but XLT requires it -->
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.11.0</version>
<version>5.12.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20190722</version>
<version>20220320</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -324,7 +333,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.14.9</version>
<version>4.10.0</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Expand Down Expand Up @@ -359,17 +368,23 @@
<artifactId>asm-util</artifactId>
<version>${asm.version}</version>
</dependency>
<!-- byte-buddy is used by Selenium and PowerMock. Ensure that the newer version wins. -->
<!-- byte-buddy is used by Selenium, Mockito and PowerMock. Ensure that the highest version wins. -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.10.5</version>
<version>1.12.2</version>
</dependency>
<!-- guava is used by Selenium, Google Compute and Checkstyle. Ensure that the highest version wins. -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<!-- Script-Doc Generator -->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.30</version>
<version>2.3.31</version>
</dependency>
<dependency>
<groupId>org.pegdown</groupId>
Expand All @@ -385,7 +400,7 @@
<dependency>
<groupId>org.parboiled</groupId>
<artifactId>parboiled-java</artifactId>
<version>1.3.1</version>
<version>1.4.1</version>
</dependency>
<!-- WebSocket-Server needed for running client-performance tests with Chrome and FF -->
<dependency>
Expand All @@ -397,17 +412,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<version>2.4.0-b180830.0359</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.2</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>me.tongfei</groupId>
Expand Down Expand Up @@ -482,14 +497,14 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.22.0</version>
<version>6.46.0</version>
<scope>test</scope>
</dependency>
<!-- HtmlUnit -->
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit4</artifactId>
<version>0.18.0</version>
<version>0.23.1</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Expand Down Expand Up @@ -539,7 +554,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.31</version>
<version>10.3.1</version>
<scope>test</scope>
</dependency>
<!-- Cobertura -->
Expand Down
Loading

0 comments on commit e040806

Please sign in to comment.