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

POM bumps #228

Merged
merged 4 commits into from
Aug 24, 2022
Merged

POM bumps #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f1cf48
POM bumps
jglick Aug 1, 2022
2b018ce
Merge branch 'master' of https://github.com/jenkinsci/mercurial-plugi…
jglick Aug 24, 2022
a0ae7e3
Newest POM, superseding #229
jglick Aug 24, 2022
6f05e68
Base image bump https://github.com/jenkinsci/mercurial-plugin/pull/22…
jglick Aug 24, 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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.40</version>
<version>4.46</version>
<relativePath />
</parent>
<artifactId>mercurial</artifactId>
Expand Down Expand Up @@ -160,7 +160,7 @@
<dependency>
<groupId>org.jenkins-ci.test</groupId>
<artifactId>docker-fixtures</artifactId>
<version>1.11</version>
<version>1.12</version>
jglick marked this conversation as resolved.
Show resolved Hide resolved
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/hudson/plugins/mercurial/Security2478Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public void checkoutShouldAbortWhenSourceIsNonRemoteAndBuildOnController() throw
public void checkoutOnAgentShouldNotAbortWhenSourceIsNonRemoteAndBuildOnAgent() throws Exception {
assertFalse("Non Remote checkout should be disallowed", MercurialSCM.ALLOW_LOCAL_CHECKOUT);
DumbSlave agent = rule.createOnlineSlave();
FilePath workspace = agent.getRootPath().createTempDir("t", "");
FilePath workspace = agent.getRootPath().child("testws");
workspace.mkdirs();
Comment on lines +69 to +70
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

amending 55904fb by @Pldi23

m.hg(workspace, "init");
m.touchAndCommit(workspace, "a");
WorkflowJob p = rule.jenkins.createProject(WorkflowJob.class, "pipeline");
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/hudson/plugins/mercurial/MercurialContainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/java:d93654cc6239
FROM jenkins/java:387404da3ce7
RUN apt-get update -y && \
apt-get install --no-install-recommends -y \
python2.7 \
Expand Down