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.

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

Adds Java 17 build #471

Merged
merged 4 commits into from
Nov 6, 2023
Merged
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11' ]
java: [ '11', '17' ]
permissions:
checks: write
contents: write
Expand Down Expand Up @@ -58,6 +58,7 @@ jobs:
with:
files: "**/test-results/**/*.xml"
comment_mode: off
check_name: Unit Tests (Java ${{ matrix.java }})

- name: Build distributions
run: ./gradlew dist --info --stacktrace
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ subprojects {

buildscript {
ext {
version_shadow = '5.1.0'
version_shadow = '7.1.2'
}
repositories {
mavenCentral()
Expand All @@ -66,7 +66,7 @@ subprojects {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.github.jengelman.gradle.plugins:shadow:$version_shadow"
classpath "gradle.plugin.com.github.johnrengelman:shadow:$version_shadow"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ import com.example.petstore.ObjectFactory
import com.example.petstore.PetService
import io.gatehill.imposter.server.BaseVerticleTest
import io.vertx.ext.unit.TestContext
import jakarta.xml.ws.BindingProvider
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import javax.xml.ws.BindingProvider

/**
* Tests for [SoapPluginImpl] using JAX-WS.
Expand Down
3 changes: 2 additions & 1 deletion test/sample-soap-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ compileJava {
}

dependencies {
api 'com.sun.xml.ws:jaxws-rt:2.3.5'
api 'jakarta.xml.ws:jakarta.xml.ws-api:4.0.0'
implementation 'com.sun.xml.ws:jaxws-rt:4.0.1'
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

package com.example.petstore;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlType;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

package com.example.petstore;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

package com.example.petstore;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.annotation.XmlElementDecl;
import jakarta.xml.bind.annotation.XmlRegistry;

import javax.xml.namespace.QName;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

package com.example.petstore;

import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.bind.annotation.XmlSeeAlso;
import jakarta.jws.WebMethod;
import jakarta.jws.WebParam;
import jakarta.jws.WebResult;
import jakarta.jws.WebService;
import jakarta.jws.soap.SOAPBinding;
import jakarta.xml.bind.annotation.XmlSeeAlso;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@

package com.example.petstore;

import jakarta.xml.ws.*;

import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceException;
import javax.xml.ws.WebServiceFeature;
import java.net.URL;


Expand Down Expand Up @@ -71,7 +68,7 @@ public PetPortType getSoapEndpoint() {
/**
*
* @param features
* A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
* A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
* @return
* returns PetPortType
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

package com.example.petstore;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
*
*
*/
@javax.xml.bind.annotation.XmlSchema(namespace = "urn:com:example:petstore")
@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:com:example:petstore")
package com.example.petstore;