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

[JENKINS-60474] use version 4 of the plugin-pom #36

Closed
wants to merge 2 commits into from
Closed

[JENKINS-60474] use version 4 of the plugin-pom #36

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
5e888b6
update jenkins baseline to 2.204.1
jtnord Dec 20, 2019
0c1ca0a
update parent for jenkinsci/plugin-pom#269
jtnord Dec 20, 2019
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
27 changes: 5 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.54</version>
<version>4.0-beta-20191220.142555-3</version>
</parent>

<name>Jenkins Maven Release Plug-in Plug-in</name>
Expand All @@ -19,8 +19,9 @@
<properties>
<maven.test.version>3.1.0</maven.test.version>
<java.level>8</java.level>
<!-- Flaky tests do not belong gin this project -->
<!-- Flaky tests do not belong in this project -->
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<jenkins.version>2.204.1</jenkins.version>
</properties>

<developers>
Expand Down Expand Up @@ -62,12 +63,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
Copy link
Member Author

Choose a reason for hiding this comment

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

switched to wiremock-standalone which shades its dependencies

<!-- newer version needed by wiremock that is in the test harness -->
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<version>9.4.20.v20190813</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -220,7 +215,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<artifactId>hamcrest-core</artifactId> <!-- should be hamcrest but junit 4.12 uses hamcrest-core:1.3-->
<version>2.2</version>
<scope>test</scope>
</dependency>
Expand All @@ -242,21 +237,9 @@
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<artifactId>wiremock-jre8-standalone</artifactId>
Copy link
Member Author

Choose a reason for hiding this comment

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

always better to use the shaded wiremock as this has jetty and guava dependencies which conflict with Jenkins' version

<version>2.25.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- TODO remove when baseline > 2.179 -->
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-suppressions</artifactId>
<version>${access-modifier-annotation.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/jvnet/hudson/plugins/m2release/nexus/StageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.apache.commons.codec.binary.Base64;
import org.kohsuke.accmod.restrictions.suppressions.SuppressRestrictedWarnings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
Expand Down Expand Up @@ -463,7 +462,6 @@ else if (response == HttpURLConnection.HTTP_NOT_FOUND) {
* @return the parsed Document.
* @throws StageException if there was an issue obtaining or parsing the document.
*/
@SuppressRestrictedWarnings(XMLUtils.class) // TODO remove when baseline > 2.179
protected Document getDocument(URL url) throws StageException {
try {
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
Expand Down