Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 8
java-version: 17
distribution: 'liberica'
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
server-username: MAVEN_USERNAME # env variable for username in deploy
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- name: Setup Maven Action
uses: s4u/setup-maven-action@v1.11.0
with:
java-version: 8
java-version: 17
java-distribution: 'liberica'
maven-version: '3.9.5'
maven-version: '3.9.10'
- name: Build with Maven
run: mvn -B package --file pom.xml
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=8.0.362.fx-librca
java=17.0.14.fx-librca
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ language: java
install: ./mvnw install -Dgpg.skip=true

jdk:
- openjdk8
- openjdk11
- openjdk17

notifications:
webhooks:
Expand Down
9 changes: 4 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
<maven.plugin.testing.annotation.version>3.15.1</maven.plugin.testing.annotation.version>
<maven.plugin.testing.harness.version>3.3.0</maven.plugin.testing.harness.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>

<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.compiler.release>17</maven.compiler.release>

<maven.cyclonedx.plugin.version>2.9.1</maven.cyclonedx.plugin.version>
<license.maven.plugin.version>2.4.0</license.maven.plugin.version>
<versions.maven.plugin.version>2.18.0</versions.maven.plugin.version>
Expand All @@ -51,7 +54,7 @@
<!-- don't bump mockito to 5 as it requires java 11 -->
<mockito.version>4.11.0</mockito.version>
<junit.version>4.13.2</junit.version>
<plexus-sec-dispatcher.version>4.0.2</plexus-sec-dispatcher.version>
<plexus-sec-dispatcher.version>4.1.0</plexus-sec-dispatcher.version>
</properties>

<repositories>
Expand Down Expand Up @@ -405,10 +408,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

<plugin>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.sigmalab.maven.plugin.jira;

import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
Expand All @@ -12,8 +13,8 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
import org.codehaus.plexus.components.secdispatcher.SecDispatcherException;

import com.atlassian.jira.rest.client.api.JiraRestClient;
import com.atlassian.jira.rest.client.api.JiraRestClientFactory;
Expand Down Expand Up @@ -117,8 +118,9 @@ public abstract class AbstractJiraMojo extends AbstractMojo {
/**
* Load username password from settings if user has not set them in JVM
* properties
* @throws IOException
*/
private void loadUserInfoFromSettings() {
private void loadUserInfoFromSettings() throws IOException {
if ( settingsKey == null ) {
settingsKey = jiraURL;
}
Expand Down Expand Up @@ -219,7 +221,7 @@ private URI computeRootURI(String url) throws URISyntaxException {

public abstract void doExecute(JiraRestClient restClient) throws MojoFailureException;

private String decrypt(String str, String server) {
private String decrypt(String str, String server) throws IOException {
try {
return securityDispatcher.decrypt(str);
}
Expand Down
Loading