Skip to content

upgrade to jcasc test harness #76

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
imod merged 7 commits into from
Jan 20, 2020
Merged

upgrade to jcasc test harness #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a320198
bump jcasc and fix jcasc test harness dependency
jetersen Jan 13, 2020
c01d63a
exclude jsoup from maven plugin
jetersen Jan 14, 2020
ea51ade
bump ssh credentials
jetersen Jan 14, 2020
b23692b
snip com.google.code.findbugs.annotations
jetersen Jan 14, 2020
b49a02f
bump parent pom
jetersen Jan 19, 2020
63bb6d7
manage commons-lang3
jetersen Jan 19, 2020
c1ba14a
fix testcases which trigger a maven build (old bundled maven version …
imod Jan 20, 2020
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
33 changes: 19 additions & 14 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>3.55</version>
<version>3.56</version>
</parent>

<artifactId>config-file-provider</artifactId>
Expand Down Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.12</version>
<version>1.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -193,11 +193,17 @@
<artifactId>maven-plugin</artifactId>
<version>3.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness-tools</artifactId>
<version>2.0</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -218,31 +224,30 @@
<version>1.16</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>1.29</version>
<version>1.35</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>1.29</version>
<groupId>io.jenkins.configuration-as-code</groupId>
<artifactId>test-harness</artifactId>
<version>1.35</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<scope>test</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>org.jenkins-ci.plugins</groupId>-->
<!--<artifactId>email-ext</artifactId>-->
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void envVariableMustBeAvailableInMavenModuleSetBuild() throws Exception {
final MavenModuleSet p = j.createProject(MavenModuleSet.class);

// p.getBuildWrappersList().add(new ConfigFileBuildWrapper(managedFiles))
p.setMaven(ToolInstallations.configureMaven3().getName());
p.setMaven(ToolInstallations.configureMaven35().getName());
p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip")));
p.setGoals("initialize"); // -s ${MVN_SETTING}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void serverCredentialsMustBeInSettingsXmlAtRuntime() throws Exception {

final MavenModuleSet p = j.createProject(MavenModuleSet.class);

p.setMaven(ToolInstallations.configureMaven3().getName());
p.setMaven(ToolInstallations.configureMaven35().getName());
p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip")));
p.setGoals("initialize");

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void mavenSettingsMustBeFoundInFreestyleProject() throws Exception {

final FreeStyleProject p = jenkins.createFreeStyleProject();

String mvnName = ToolInstallations.configureMaven3().getName();
String mvnName = ToolInstallations.configureMaven35().getName();
Config c1 = createSetting(mavenSettingProvider);
Config c2 = createSetting(globalMavenSettingsConfigProvider);

Expand All @@ -151,7 +151,7 @@ public void notFoundMavenSettingsMustCauseBuildToFail() throws Exception {

final FreeStyleProject p = jenkins.createFreeStyleProject();

String mvnName = ToolInstallations.configureMaven3().getName();
String mvnName = ToolInstallations.configureMaven35().getName();

MvnSettingsProvider s1 = new MvnSettingsProvider("dummyId");
MvnGlobalSettingsProvider s2 = new MvnGlobalSettingsProvider("dummyGlobalId");
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/jenkinsci/plugins/configfiles/maven/job/SettingsEnvVarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void serverCredentialsMustBeInSettingsXmlAtRuntime() throws Exception {

final MavenModuleSet p = j.createProject(MavenModuleSet.class);

p.setMaven(ToolInstallations.configureMaven3().getName());
p.setMaven(ToolInstallations.configureMaven35().getName());
p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip")));
p.setGoals("initialize");

Expand Down