Skip to content

Increase version to 2.340 and bump other dependants #69

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

Merged
PierreBtz merged 2 commits into from
May 12, 2022
Merged

Increase version to 2.340 and bump other dependants #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5301741
Resolve conflicts
meiswjn Apr 20, 2022
48028d8
Fix test compilation and run
PierreBtz May 12, 2022
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
30 changes: 5 additions & 25 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.18</version>
<version>4.40</version>
<relativePath />
</parent>

Expand All @@ -14,7 +14,7 @@
<name>Audit Trail</name>
<version>3.11-SNAPSHOT</version>
<properties>
<jenkins.version>2.263.1</jenkins.version>
<jenkins.version>2.340</jenkins.version>
<java.level>8</java.level>
<slf4jVersion>1.7.30</slf4jVersion>
</properties>
Expand Down Expand Up @@ -80,6 +80,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1126.ve05618c41e62</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -116,32 +117,11 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.263.x</artifactId>
<version>807.v6d348e44c987</version>
<artifactId>bom-2.332.x</artifactId>
<version>1246.va_b_50630c1d19</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- See
https://groups.google.com/d/msgid/jenkinsci-dev/64f55a31-4dfa-4ba9-b15e-aca6e7620864n%40googlegroups.com
-->
<dependency><!-- If caffeine is needed, use version 2.9.1.
Resolves an upper bounds dependency message.
Does not include caffeine in the hpi file. -->
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.9.1</version>
<exclusions>
<!-- do not bring in the annotations -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/hudson/plugins/audit_trail/AuditTrailFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ public void createItemLogsTheNewItemName() throws Exception {
form.getInputByName("name").blur();
// not clear to me why the input is not visible in the test (yet it exists in the page)
// for some reason the two next calls are needed
form.getInputByValue("hudson.model.FreeStyleProject").click(false, false, false, true, true, false);
form.getInputByValue("hudson.model.FreeStyleProject").click(false, false, false, true, false, true, false);
form.getInputByValue("hudson.model.FreeStyleProject").setChecked(true);
wc.waitForBackgroundJavaScript(50);
j.submit(form);

String log = Util.loadFile(new File(tmpDir.getRoot(), "create-item.log.0"), StandardCharsets.UTF_8);
assertTrue("logged actions: " + log, Pattern.compile(".*createItem \\(" + jobName + "\\).*by \\QNA from 127.0.0.1\\E.*", Pattern.DOTALL).matcher(log).matches());

}
}