diff options
author | 2024-07-03 09:31:01 -0400 | |
---|---|---|
committer | 2024-07-17 10:21:28 -0400 | |
commit | 1cd99ed17a0d034ef8e54a7ac3dc059871dc7a1a (patch) | |
tree | 4654defdb1459041925568be88081ca224a181b3 /pomba/network-discovery/src | |
parent | 3f9e2b6c2bcbaa0b3804e6a9b96e8f7f37ea952a (diff) |
Resolve build issuesmontreal
Build was failing due to issues missed in port to java 17. Updated
sdnc/apps to change dependencies from javax.* to jakarta.* - required
for Java 17. Also, latest version of snakeyaml cannot handle size of
yaml based SDNC swagger, so replaced that with JSON based version.
Issue-ID: SDNC-1843
Change-Id: I4df872481c56aea496de0d2b9cc349799ff6b60c
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'pomba/network-discovery/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java index 226f325..67ce8d3 100644 --- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java +++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; @@ -93,4 +93,4 @@ public interface RestService { @ApiParam(required=true) List<String> resourceIds) throws ApplicationException; -}
\ No newline at end of file +} diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java index adb5df0..6b68f22 100644 --- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java +++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java @@ -25,7 +25,7 @@ import static org.onap.sdnc.apps.pomba.networkdiscovery.ApplicationException.Err import java.util.List; import java.util.UUID; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; diff --git a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java index 39239e9..bee715f 100644 --- a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java +++ b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java @@ -39,7 +39,7 @@ import java.util.Base64; import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; |