Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump org.jenkins-ci:acceptance-test-harness from 5968.v180888e51761 to 5997.v2a_1a_696620a_0 #828

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Bump org.jenkins-ci:acceptance-test-harness from 5968.v180888e51761 to 5997.v2a_1a_696620a_0 #828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf7146
Bump org.jenkins-ci:acceptance-test-harness
dependabot[bot] Sep 17, 2024
13e5ef9
Add dependency to JAXB which is not part of ATH anymore.
uhafner Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 105 additions & 82 deletions ui-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
<properties>
<jenkins.version>2.476</jenkins.version>
<hpi-plugin.version>3.57</hpi-plugin.version>

<module.name>${project.groupId}.git.forensics.ui.tests</module.name>
<json-smart.version>2.3</json-smart.version>
<json-unit-assertj.version>2.40.0</json-unit-assertj.version>
<module.name>${project.groupId}.warnings.ui.tests</module.name>
<browser>firefox-container</browser>

<!-- Maven Surefire ArgLine -->
<argLine>-Djava.awt.headless=true -Xmx1024m -Djenkins.test.timeout=1000 --add-opens java.base/sun.reflect.annotation=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
Expand Down Expand Up @@ -47,14 +49,19 @@
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>acceptance-test-harness</artifactId>
<version>5968.v180888e51761</version>
<version>5997.v2a_1a_696620a_0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -67,9 +74,101 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
<version>${json-unit-assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-json-path</artifactId>
<version>${json-unit-assertj.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<repositories>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
<repository>
<id>incrementals.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/incrementals/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<profiles>
<profile>
<id>no-ui-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
<profile>
<id>no-ui-tests-on-mac</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
<profile>
<id>ui-tests-locally</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1798 -->
<environmentVariables>
<PLUGINS_DIR>../plugin/target/test-classes/test-dependencies</PLUGINS_DIR>
<JENKINS_VERSION>${jenkins.version}</JENKINS_VERSION>
<SKIP_UPDATES>true</SKIP_UPDATES>
</environmentVariables>
<properties>
<browser>firefox</browser>
</properties>
<rerunFailingTestsCount>1</rerunFailingTestsCount>
<includes>
<include>**/*Tests.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
</profile>
<profile>
<id>consume-incrementals</id>
</profile>
<profile>
<id>might-produce-incrementals</id>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.pitest</groupId>
Expand Down Expand Up @@ -147,7 +246,8 @@
<environmentVariables>
<PLUGINS_DIR>../plugin/target/test-classes/test-dependencies</PLUGINS_DIR>
<JENKINS_VERSION>${jenkins.version}</JENKINS_VERSION>
<BROWSER>chrome-container</BROWSER>
<BROWSER>${browser}</BROWSER>
<SKIP_UPDATES>true</SKIP_UPDATES>
</environmentVariables>
<rerunFailingTestsCount>1</rerunFailingTestsCount>
<includes>
Expand Down Expand Up @@ -189,81 +289,4 @@
</plugins>
</build>

<repositories>
<repository>
<id>maven.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
<repository>
<id>incrementals.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/incrementals/</url>
</repository>
</repositories>

<profiles>
<profile>
<id>no-ui-tests-on-windows</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
<profile>
<id>no-ui-tests-on-mac</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
</profile>
<profile>
<id>ui-tests-locally</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<reuseForks>false</reuseForks>
<trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1798 -->
<environmentVariables>
<PLUGINS_DIR>../plugin/target/test-classes/test-dependencies</PLUGINS_DIR>
<JENKINS_VERSION>${jenkins.version}</JENKINS_VERSION>
<BROWSER>chrome</BROWSER>
</environmentVariables>
<rerunFailingTestsCount>1</rerunFailingTestsCount>
<includes>
<include>**/*Tests.java</include>
<include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
</profile>
<profile>
<id>consume-incrementals</id>
</profile>
<profile>
<id>might-produce-incrementals</id>
</profile>
</profiles>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

</project>