Skip to content

Commit

Permalink
Preparation for Java 11. Remove XML Stuff and replace it with JAXB
Browse files Browse the repository at this point in the history
  • Loading branch information
Watermeyer, Stephan committed Jul 23, 2021
1 parent 361f636 commit 12ae319
Show file tree
Hide file tree
Showing 6 changed files with 317 additions and 219 deletions.
361 changes: 181 additions & 180 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,187 +1,188 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.57</version>
<relativePath />
</parent>

<artifactId>maven-artifact-choicelistprovider</artifactId>
<version>1.8.2-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Maven Artifact ChoiceListProvider (Nexus)</name>
<description>A ChoiceListProvider to read Maven artifact information from a Nexus repository or MavenCentral</description>
<url>https://github.com/jenkinsci/maven-artifact-choicelistprovider-plugin/blob/master/README.md</url>

<scm>
<connection>scm:git:git@github.com:jenkinsci/maven-artifact-choicelistprovider-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/maven-artifact-choicelistprovider-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>maven-artifact-choicelistprovider-1.3.3</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jenkins.version>1.609.3</jenkins.version>
<java.level>8</java.level>
<revision>1.4.0</revision>
<changelist>-SNAPSHOT</changelist>
</properties>

<dependencies>
<!-- Java 11 / JAXB Stuff / Parse Nexus XML Interface -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jaxb</artifactId>
<version>2.3.0.1</version>
</dependency>

<!-- For Authentication Details -->
<dependency>
<artifactId>credentials</artifactId>
<version>2.3.19</version>
<groupId>org.jenkins-ci.plugins</groupId>
</dependency>


<!-- Basic Dependency to allow Extension of the ChoiceListProvider -->
<dependency>
<groupId>jp.ikedam.jenkins.plugins</groupId>
<artifactId>extensible-choice-parameter</artifactId>
<version>1.7.0</version>
</dependency>

<!-- All JaxWS/RS, Jersey and Glassfish Dependencies to allow RESTful Service calls -->
<!--<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
</dependency>-->
<!--<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>-->
<!--<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.6</version>
</dependency>-->

<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>2.25.1</version>
</dependency>

<!-- Necessary to parse the XML from Nexus Lucene Service -->
<dependency>
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-indexer-lucene-model</artifactId>
<version>2.14.19-01</version>
</dependency>

<!-- Necessary to parse JSON from Maven Central -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.4</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.19.0</version>
</dependency>
</dependencies>

<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>

<developers>
<developer>
<id>phreakadelle</id>
<name>Stephan Watermeyer</name>
</developer>
</developers>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.57</version>
<relativePath />
</parent>

<artifactId>maven-artifact-choicelistprovider</artifactId>
<version>1.8.2-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Maven Artifact ChoiceListProvider (Nexus)</name>
<description>A ChoiceListProvider to read Maven artifact information from a Nexus repository or MavenCentral</description>
<url>https://github.com/jenkinsci/maven-artifact-choicelistprovider-plugin/blob/master/README.md</url>

<scm>
<connection>scm:git:git@github.com:jenkinsci/maven-artifact-choicelistprovider-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/maven-artifact-choicelistprovider-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>maven-artifact-choicelistprovider-1.3.3</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jenkins.version>2.138.1</jenkins.version>
<java.level>8</java.level>
<revision>1.4.0</revision>
<changelist>-SNAPSHOT</changelist>
</properties>

<dependencies>

<dependency>
<groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-core-impl</artifactId>
<version>1.3.3.Final</version>
</dependency>

<!-- Java 11 / JAXB Stuff / Parse Nexus XML Interface -->
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jaxb</artifactId>
<version>2.3.0.1</version>
</dependency>

<!-- For Authentication Details -->
<dependency>
<artifactId>credentials</artifactId>
<version>2.3.19</version>
<groupId>org.jenkins-ci.plugins</groupId>
</dependency>


<!-- Basic Dependency to allow Extension of the ChoiceListProvider -->
<dependency>
<groupId>jp.ikedam.jenkins.plugins</groupId>
<artifactId>extensible-choice-parameter</artifactId>
<version>1.7.0</version>
</dependency>

<!-- All JaxWS/RS, Jersey and Glassfish Dependencies to allow RESTful Service
calls -->
<!--<dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version> </dependency> -->
<!--<dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId>
<version>1.1.1</version> </dependency> -->
<!--<dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId>
<version>4.5.6</version> </dependency> -->

<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>2.25.1</version>
</dependency>

<!-- Necessary to parse the XML from Nexus Lucene Service -->
<dependency>
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-indexer-lucene-model</artifactId>
<version>2.14.19-01</version>
</dependency>

<!-- Necessary to parse JSON from Maven Central -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.4</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.19.0</version>
</dependency>
</dependencies>

<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>

<developers>
<developer>
<id>phreakadelle</id>
<name>Stephan Watermeyer</name>
</developer>
</developers>

<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>https://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.jenkins-ci.tools
</groupId>
<artifactId>
</groupId>
<artifactId>
maven-hpi-plugin
</artifactId>
<versionRange>
</artifactId>
<versionRange>
[1.74,)
</versionRange>
<goals>
<goal>validate</goal>
<goal>
</versionRange>
<goals>
<goal>validate</goal>
<goal>
resolve-test-dependencies
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

0 comments on commit 12ae319

Please sign in to comment.