diff --git a/pom.xml b/pom.xml index b7923ad6f..d814e7651 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,8 @@ UTF-8 yyyy-MM-dd'T'HH:mm:ssZ 9.0.0.8 - 1.19 - 1.10.19 + 3.1.3 + 5.2.0 @@ -124,7 +124,7 @@ commons-io commons-io - 2.7 + 2.13.0 xml-apis @@ -156,6 +156,11 @@ schema-utils 1.8 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.0 + @@ -163,16 +168,16 @@ maven-compiler-plugin - 3.6.0 + 3.11.0 - 1.8 - 1.8 + 17 + 17 org.apache.maven.plugins maven-site-plugin - 3.6 + 3.12.1 site-package @@ -186,12 +191,12 @@ org.apache.maven.doxia doxia-module-markdown - 1.7 + 1.12.0 org.asciidoctor asciidoctor-maven-plugin - 1.5.3 + 2.2.3 @@ -200,40 +205,10 @@ true - - org.apache.maven.plugins - maven-pdf-plugin - 1.3 - - - pdf - site - - pdf - - - ${project.build.directory}/pdf - false - - - - - - org.apache.maven.doxia - doxia-module-markdown - 1.6 - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.3 - - - org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.0 true @{project.version} @@ -243,7 +218,7 @@ org.apache.maven.plugins maven-scm-publish-plugin - 1.1 + 3.2.1 gh-pages @@ -255,7 +230,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19.1 + 3.0.0 null:null @@ -269,7 +244,7 @@ maven-jar-plugin - 3.0.2 + 3.3.0 @@ -287,39 +262,10 @@ maven-repository-plugin 2.4 - org.codehaus.mojo buildnumber-maven-plugin - 1.4 + 3.0.0 validate @@ -352,6 +298,29 @@ + + maven-remote-resources-plugin + 3.0.0 + + + maven-assembly-plugin + 3.5.0 + + + com.smartbear.soapui + soapui-maven-plugin + 5.7.0 + + + com.spotify + docker-maven-plugin + 1.2.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + @@ -360,7 +329,7 @@ maven-project-info-reports-plugin - 2.9 + 3.4.3 @@ -399,7 +368,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -419,7 +388,7 @@ org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 attach-sources diff --git a/teamengine-console/pom.xml b/teamengine-console/pom.xml index 9a9240680..8f96f4726 100644 --- a/teamengine-console/pom.xml +++ b/teamengine-console/pom.xml @@ -34,7 +34,6 @@ maven-remote-resources-plugin - 1.5 ${project.groupId}:teamengine-resources:${project.version} @@ -52,7 +51,6 @@ maven-assembly-plugin - 2.6 ${basedir}/src/assembly/bin.xml diff --git a/teamengine-core/pom.xml b/teamengine-core/pom.xml index 04f4601a6..ec467101c 100644 --- a/teamengine-core/pom.xml +++ b/teamengine-core/pom.xml @@ -97,7 +97,7 @@ nl.jqno.equalsverifier equalsverifier - 2.5.2 + 3.14.1 test @@ -123,19 +123,6 @@ maven-javadoc-plugin - - true - package - -Xdoclint:none - - - - attach-javadocs - - jar - - - diff --git a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java index d89f68c18..a8b76c3f9 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java +++ b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java @@ -57,6 +57,8 @@ import com.occamlab.te.vocabulary.EARL; import com.occamlab.te.vocabulary.HTTP; +import static java.lang.Integer.valueOf; + public class CtlEarlReporter { private static final Logger LOG = Logger.getLogger( CtlEarlReporter.class.getName() ); @@ -188,14 +190,14 @@ private Model generateEarlReport( String suiteName, Map params, Document documen } this.testRun.addProperty( CITE.requirements, this.reqs ); - this.testRun.addLiteral( CITE.testsPassed, new Integer( this.totalPassCount ) ); - this.testRun.addLiteral( CITE.testsFailed, new Integer( this.totalFailCount ) ); - this.testRun.addLiteral( CITE.testsSkipped, new Integer( this.totalSkipCount ) ); - this.testRun.addLiteral( CITE.testsContinue, new Integer( this.totalContinueCount ) ); - this.testRun.addLiteral( CITE.testsBestPractice, new Integer( this.totalBestPracticeCount ) ); - this.testRun.addLiteral( CITE.testsNotTested, new Integer( this.totalNotTestedCount ) ); - this.testRun.addLiteral( CITE.testsWarning, new Integer( this.totalWarningCount ) ); - this.testRun.addLiteral( CITE.testsInheritedFailure, new Integer( this.totalInheritedFailureCount ) ); + this.testRun.addLiteral( CITE.testsPassed, valueOf( this.totalPassCount ) ); + this.testRun.addLiteral( CITE.testsFailed, valueOf( this.totalFailCount ) ); + this.testRun.addLiteral( CITE.testsSkipped, valueOf( this.totalSkipCount ) ); + this.testRun.addLiteral( CITE.testsContinue, valueOf( this.totalContinueCount ) ); + this.testRun.addLiteral( CITE.testsBestPractice, valueOf( this.totalBestPracticeCount ) ); + this.testRun.addLiteral( CITE.testsNotTested, valueOf( this.totalNotTestedCount ) ); + this.testRun.addLiteral( CITE.testsWarning, valueOf( this.totalWarningCount ) ); + this.testRun.addLiteral( CITE.testsInheritedFailure, valueOf( this.totalInheritedFailureCount ) ); this.testRun.addLiteral( CITE.testSuiteType, "ctl" ); this.testRun.addLiteral( CITE.areCoreConformanceClassesPassed, areCoreConformanceClassesPassed ); @@ -233,14 +235,14 @@ private void getSubtestResult( Model model, NodeList testcallList, NodeList logL processTestResults( model, logElements, logList, conformanceClass, null ); Resource testReq = model.createResource( conformanceClass ); - testReq.addLiteral( CITE.testsPassed, new Integer( this.cPassCount ) ); - testReq.addLiteral( CITE.testsFailed, new Integer( this.cFailCount ) ); - testReq.addLiteral( CITE.testsSkipped, new Integer( this.cSkipCount ) ); - testReq.addLiteral( CITE.testsContinue, new Integer( this.cContinueCount ) ); - testReq.addLiteral( CITE.testsBestPractice, new Integer( this.cBestPracticeCount ) ); - testReq.addLiteral( CITE.testsNotTested, new Integer( this.cNotTestedCount ) ); - testReq.addLiteral( CITE.testsWarning, new Integer( this.cWarningCount ) ); - testReq.addLiteral( CITE.testsInheritedFailure, new Integer( this.cInheritedFailureCount ) ); + testReq.addLiteral( CITE.testsPassed, valueOf( this.cPassCount ) ); + testReq.addLiteral( CITE.testsFailed, valueOf( this.cFailCount ) ); + testReq.addLiteral( CITE.testsSkipped, valueOf( this.cSkipCount ) ); + testReq.addLiteral( CITE.testsContinue, valueOf( this.cContinueCount ) ); + testReq.addLiteral( CITE.testsBestPractice, valueOf( this.cBestPracticeCount ) ); + testReq.addLiteral( CITE.testsNotTested, valueOf( this.cNotTestedCount ) ); + testReq.addLiteral( CITE.testsWarning, valueOf( this.cWarningCount ) ); + testReq.addLiteral( CITE.testsInheritedFailure, valueOf( this.cInheritedFailureCount ) ); if(testInfo.isBasic){ if(cFailCount > 0 || cInheritedFailureCount > 0){ areCoreConformanceClassesPassed = false; diff --git a/teamengine-core/src/main/java/com/occamlab/te/parsers/ImageParser.java b/teamengine-core/src/main/java/com/occamlab/te/parsers/ImageParser.java index af3ddc15c..1ded212b7 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/parsers/ImageParser.java +++ b/teamengine-core/src/main/java/com/occamlab/te/parsers/ImageParser.java @@ -62,6 +62,8 @@ Paul Daisey (Image Matters LLC) import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import static java.lang.Integer.valueOf; + /** * Extracts the body of a response message and treats it as an image resource. * If the entity does not correspond to a supported image format, an exception @@ -237,7 +239,7 @@ private static void processBufferedImage(BufferedImage buffimage, sampleMap = new HashMap(); bandMap.put(band, sampleMap); } - sampleMap.put(Integer.decode(sample), new Integer(0)); + sampleMap.put(Integer.decode(sample), valueOf(0)); } } else if (node.getLocalName().equals("transparentNodata")) { // 2011-08-24 // PwD @@ -296,7 +298,7 @@ private static void processBufferedImage(BufferedImage buffimage, sample |= bands[i][x] << ((band_indexes.length - i - 1) * 8); } - Integer sampleObj = new Integer(sample); + Integer sampleObj = valueOf(sample); boolean add = addall; if (!addall) { @@ -305,9 +307,9 @@ private static void processBufferedImage(BufferedImage buffimage, if (add) { Integer count = (Integer) sampleMap.get(sampleObj); if (count == null) { - count = new Integer(0); + count = valueOf(0); } - count = new Integer(count.intValue() + 1); + count = valueOf(count.intValue() + 1); sampleMap.put(sampleObj, count); } } @@ -373,7 +375,7 @@ private static void processBufferedImage(BufferedImage buffimage, Integer count = (Integer) sampleMap.get(Integer .decode(sample)); if (count == null) - count = new Integer(0); + count = valueOf(0); Node textnode = doc.createTextNode(count.toString()); node.appendChild(textnode); } diff --git a/teamengine-core/src/main/java/com/occamlab/te/parsers/XSLTransformationParser.java b/teamengine-core/src/main/java/com/occamlab/te/parsers/XSLTransformationParser.java index 9210805e6..8aeca1e4c 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/parsers/XSLTransformationParser.java +++ b/teamengine-core/src/main/java/com/occamlab/te/parsers/XSLTransformationParser.java @@ -29,6 +29,9 @@ import com.occamlab.te.util.DomUtils; import com.occamlab.te.util.URLConnectionUtils; +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; + public class XSLTransformationParser { private static final Logger LOGR = Logger @@ -48,8 +51,8 @@ public XSLTransformationParser() throws Exception { tf = TransformerFactory.newInstance(); defaultProperties = new HashMap(); defaultParams = new HashMap(); - defaultIgnoreErrors = new Boolean(false); - defaultIgnoreWarnings = new Boolean(true); + defaultIgnoreErrors = FALSE; + defaultIgnoreWarnings = TRUE; } public XSLTransformationParser(Node node) throws Exception { diff --git a/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java b/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java index 1fd0e6409..e4a546e30 100644 --- a/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java +++ b/teamengine-core/src/main/java/com/occamlab/te/util/LogUtils.java @@ -70,6 +70,8 @@ import net.sf.saxon.s9api.Axis; import net.sf.saxon.s9api.XdmNode; +import static java.lang.Long.valueOf; + public class LogUtils { private static final Logger LOGR = Logger.getLogger(LogUtils.class @@ -135,7 +137,7 @@ public static Document readLog(File logDir, String callpath) // The log may not have been closed properly. // Try again with a closing tag RandomAccessFile raf = new RandomAccessFile(f, "r"); - int l = new Long(raf.length()).intValue(); + int l = valueOf(raf.length()).intValue(); byte[] buf = new byte[l + 8]; raf.read(buf); raf.close(); diff --git a/teamengine-core/src/test/java/com/occamlab/te/parsers/ImageParserTest.java b/teamengine-core/src/test/java/com/occamlab/te/parsers/ImageParserTest.java index f768ba3d9..052397c64 100644 --- a/teamengine-core/src/test/java/com/occamlab/te/parsers/ImageParserTest.java +++ b/teamengine-core/src/test/java/com/occamlab/te/parsers/ImageParserTest.java @@ -48,7 +48,7 @@ public void parseText() throws SAXException, IOException { @Test public void parsePNG_noAlphaChannel() throws SAXException, IOException { - URL url = getClass().getResource("/img/square-white.png"); + URL url = getClass().getResource("/img/square-white-no-transparency.png"); Document instruct = docBuilder.parse(getClass().getResourceAsStream( "/img/model-argb-transparent.xml")); StringWriter strWriter = new StringWriter(); @@ -59,7 +59,7 @@ public void parsePNG_noAlphaChannel() throws SAXException, IOException { Element countElem = (Element) result.getElementsByTagNameNS(PARSERS_NS, "count").item(0); int pixelCount = Integer.parseInt(countElem.getTextContent().trim()); - assertEquals("Unexpected number of transparent pixels.", pixelCount, 0); + assertEquals("Unexpected number of transparent pixels.", 0, pixelCount); } @Test diff --git a/teamengine-core/src/test/resources/img/square-white-no-transparency.png b/teamengine-core/src/test/resources/img/square-white-no-transparency.png new file mode 100644 index 000000000..5d948aebf Binary files /dev/null and b/teamengine-core/src/test/resources/img/square-white-no-transparency.png differ diff --git a/teamengine-realm/pom.xml b/teamengine-realm/pom.xml index efb0a4dfa..7d026c9dd 100644 --- a/teamengine-realm/pom.xml +++ b/teamengine-realm/pom.xml @@ -26,13 +26,22 @@ mockito-core test + + jakarta.xml.bind + jakarta.xml.bind-api + + + org.glassfish.jaxb + jaxb-runtime + 4.0.3 + - tomcat7 + tomcat9 - tomcat7 + tomcat9 true @@ -41,7 +50,7 @@ org.apache.tomcat tomcat-catalina - 7.0.81 + 10.1.11 provided diff --git a/teamengine-realm/src/main/java/com/occamlab/te/realm/PBKDF2Realm.java b/teamengine-realm/src/main/java/com/occamlab/te/realm/PBKDF2Realm.java index b46288708..c3f661750 100644 --- a/teamengine-realm/src/main/java/com/occamlab/te/realm/PBKDF2Realm.java +++ b/teamengine-realm/src/main/java/com/occamlab/te/realm/PBKDF2Realm.java @@ -73,15 +73,10 @@ public class PBKDF2Realm extends RealmBase { private static final Logger LOGR = Logger.getLogger(PBKDF2Realm.class.getName()); - // Fortify Mod: initialize rootPath - // private String rootPath = null; - private String rootPath = System.getProperty("TE_BASE"); private DocumentBuilder DB = null; private HashMap principals = new HashMap(); - public String getRoot() { - return rootPath; - } + private String password; /** * Return the Principal associated with the specified username and @@ -92,7 +87,7 @@ public Principal authenticate(String username, String credentials) { GenericPrincipal principal = (GenericPrincipal) getPrincipal(username); if (null != principal) { try { - if (!PasswordStorage.verifyPassword(credentials, principal.getPassword())) { + if (!PasswordStorage.verifyPassword(credentials, password)) { principal = null; } } catch (CannotPerformOperationException | InvalidHashException e) { @@ -109,7 +104,7 @@ protected String getPassword(String username) { if (principal == null) { return null; } else { - return principal.getPassword(); + return password; } } @@ -146,11 +141,6 @@ protected Principal getPrincipal(String username) { return principal; } - @Override - protected String getName() { - return "UserFilesRealm"; - } - private GenericPrincipal readPrincipal(String username) { List roles = new ArrayList(); File usersdir = new File(System.getProperty("TE_BASE"), "users"); @@ -171,14 +161,14 @@ private GenericPrincipal readPrincipal(String username) { } Element userElement = (Element) (userInfo.getElementsByTagName("user").item(0)); Element passwordElement = (Element) (userElement.getElementsByTagName("password").item(0)); - String password = passwordElement.getTextContent(); + password = passwordElement.getTextContent(); Element rolesElement = (Element) (userElement.getElementsByTagName("roles").item(0)); NodeList roleElements = rolesElement.getElementsByTagName("name"); for (int i = 0; i < roleElements.getLength(); i++) { String name = ((Element) roleElements.item(i)).getTextContent(); roles.add(name); } - GenericPrincipal principal = createGenericPrincipal(username, password, roles); + GenericPrincipal principal = createGenericPrincipal(username, roles); return principal; } @@ -187,15 +177,13 @@ private GenericPrincipal readPrincipal(String username) { * * @param username * The username for this user. - * @param password - * The authentication credentials for this user. * @param roles * The set of roles (specified using String values) associated * with this user. * @return A GenericPrincipal for use by this Realm implementation. */ @SuppressWarnings({ "rawtypes", "unchecked" }) - GenericPrincipal createGenericPrincipal(String username, String password, List roles) { + GenericPrincipal createGenericPrincipal(String username, List roles) { Class klass = null; try { klass = Class.forName("org.apache.catalina.realm.GenericPrincipal"); @@ -206,8 +194,8 @@ GenericPrincipal createGenericPrincipal(String username, String password, List principals = new HashMap(); + private String password; + public String getRoot() { return rootPath; } @@ -102,14 +105,14 @@ private GenericPrincipal readPrincipal(String username) { } Element userElement = (Element) (userInfo.getElementsByTagName("user").item(0)); Element passwordElement = (Element) (userElement.getElementsByTagName("password").item(0)); - String password = passwordElement.getTextContent(); + password = passwordElement.getTextContent(); Element rolesElement = (Element) (userElement.getElementsByTagName("roles").item(0)); NodeList roleElements = rolesElement.getElementsByTagName("name"); for (int i = 0; i < roleElements.getLength(); i++) { String name = ((Element) roleElements.item(i)).getTextContent(); roles.add(name); } - GenericPrincipal principal = createGenericPrincipal(username, password, roles); + GenericPrincipal principal = createGenericPrincipal(username, roles); return principal; } @@ -118,15 +121,13 @@ private GenericPrincipal readPrincipal(String username) { * * @param username * The username for this user. - * @param password - * The authentication credentials for this user. * @param roles * The set of roles (specified using String values) associated * with this user. * @return A GenericPrincipal for use by this Realm implementation. */ @SuppressWarnings({ "rawtypes", "unchecked" }) - GenericPrincipal createGenericPrincipal(String username, String password, List roles) { + GenericPrincipal createGenericPrincipal(String username, List roles) { Class klass = null; try { klass = Class.forName("org.apache.catalina.realm.GenericPrincipal"); @@ -137,8 +138,8 @@ GenericPrincipal createGenericPrincipal(String username, String password, List roles = new ArrayList(); roles.add(ROLE_1); UserFilesRealm iut = new UserFilesRealm(); - GenericPrincipal result = iut.createGenericPrincipal(username, password, roles); + GenericPrincipal result = iut.createGenericPrincipal(username, roles); Assert.assertNotNull(result); Assert.assertEquals("Unexpected username", username, result.getName()); - Assert.assertEquals("Unexpected password", password, result.getPassword()); Assert.assertTrue("Expected principal to have role " + ROLE_1, result.hasRole(ROLE_1)); } } diff --git a/teamengine-resources/pom.xml b/teamengine-resources/pom.xml index a191c0dd0..9be835e4f 100644 --- a/teamengine-resources/pom.xml +++ b/teamengine-resources/pom.xml @@ -19,7 +19,6 @@ maven-remote-resources-plugin - 1.5 diff --git a/teamengine-spi/pom.xml b/teamengine-spi/pom.xml index 471ad5d82..e55d16dab 100644 --- a/teamengine-spi/pom.xml +++ b/teamengine-spi/pom.xml @@ -58,19 +58,19 @@ - javax.ws.rs - jsr311-api - 1.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided - com.sun.jersey + org.glassfish.jersey.core jersey-server ${jersey.version} - com.sun.jersey.contribs - jersey-multipart + org.glassfish.jersey.media + jersey-media-multipart ${jersey.version} diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java index df033b14a..f220ee42d 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/EarlReporter.java @@ -34,7 +34,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.rdf.model.Bag; @@ -59,6 +59,8 @@ import com.occamlab.te.vocabulary.EARL; import com.occamlab.te.vocabulary.HTTP; +import static java.lang.Integer.valueOf; + /** * A reporter that creates and serializes an RDF graph containing the test @@ -105,9 +107,9 @@ public void generateReport(List xmlSuites, List suites, addTestRequirements(model, suite.getXmlSuite().getTests()); addTestInputs(model, suite.getXmlSuite().getAllParameters()); TestRunSummary summary = new TestRunSummary(suite); - this.testRun.addLiteral(CITE.testsPassed, new Integer(summary.getTotalPassed())); - this.testRun.addLiteral(CITE.testsFailed, new Integer(summary.getTotalFailed())); - this.testRun.addLiteral(CITE.testsSkipped, new Integer(summary.getTotalSkipped())); + this.testRun.addLiteral(CITE.testsPassed, valueOf(summary.getTotalPassed())); + this.testRun.addLiteral(CITE.testsFailed, valueOf(summary.getTotalFailed())); + this.testRun.addLiteral(CITE.testsSkipped, valueOf(summary.getTotalSkipped())); Literal duration = model.createTypedLiteral(summary.getTotalDuration(), XSDDatatype.XSDduration); this.testRun.addLiteral(DCTerms.extent, duration); @@ -150,9 +152,9 @@ void processSuiteResults(Model model, Map results) { int nPassed = testContext.getPassedTests().size(); int nSkipped = testContext.getSkippedTests().size(); int nFailed = testContext.getFailedTests().size(); - testReq.addLiteral(CITE.testsPassed, new Integer(nPassed)); - testReq.addLiteral(CITE.testsFailed, new Integer(nFailed)); - testReq.addLiteral(CITE.testsSkipped, new Integer(nSkipped)); + testReq.addLiteral(CITE.testsPassed, valueOf(nPassed)); + testReq.addLiteral(CITE.testsFailed, valueOf(nFailed)); + testReq.addLiteral(CITE.testsSkipped, valueOf(nSkipped)); if (nPassed + nFailed == 0) { testReq.addProperty(DCTerms.description, "A precondition was not met. All tests in this set were skipped."); diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ApplicationComponents.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ApplicationComponents.java index 937e1d859..0338fd8e1 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ApplicationComponents.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ApplicationComponents.java @@ -7,25 +7,25 @@ */ package com.occamlab.te.spi.jaxrs; -import com.sun.jersey.api.core.PackagesResourceConfig; +import org.glassfish.jersey.server.ResourceConfig; /** * Dynamically searches for root resource and provider classes. An instance of * this class defines the components of a JAX-RS application and is used to * configure a runtime environment such as a web container. * - * @see com.sun.jersey.api.core.PackagesResourceConfig - * @see javax.ws.rs.core.Application + * @see org.glassfish.jersey.server.ResourceConfig */ -public class ApplicationComponents extends PackagesResourceConfig { +public class ApplicationComponents extends ResourceConfig { /** - * Default constructor scans for root resource classes in the + * Scans for root resource classes in the * com.occamlab.te.spi.jaxrs.resources package (or a * sub-package). */ public ApplicationComponents() { - super("com.occamlab.te.spi.jaxrs.resources"); + packages("com.occamlab.te.spi.jaxrs.resources"); + property("jersey.config.server.redirect.servlet.extension", "false"); } } diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ErrorResponseBuilder.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ErrorResponseBuilder.java index 96f883fa9..e0eaa4b25 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ErrorResponseBuilder.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/ErrorResponseBuilder.java @@ -7,8 +7,8 @@ */ package com.occamlab.te.spi.jaxrs; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; /** * Creates an error response that includes an entity body describing the error diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/ImageResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/ImageResource.java index a6a42d45a..2fab7c1da 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/ImageResource.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/ImageResource.java @@ -8,12 +8,12 @@ package com.occamlab.te.spi.jaxrs.resources; import java.io.InputStream; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import com.occamlab.te.spi.jaxrs.ErrorResponseBuilder; diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TEStatistics.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TEStatistics.java index f2e4225f5..a7c7ac584 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TEStatistics.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TEStatistics.java @@ -14,12 +14,12 @@ import java.util.logging.Logger; import java.util.logging.SimpleFormatter; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import javax.xml.transform.Source; import javax.xml.transform.sax.SAXSource; diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java index 1e39942e7..3128ee184 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java @@ -17,19 +17,19 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -44,7 +44,7 @@ import com.occamlab.te.spi.jaxrs.TestSuiteRegistry; import com.occamlab.te.spi.util.TestRunUtils; import com.occamlab.te.util.LogUtils; -import com.sun.jersey.multipart.FormDataParam; +import org.glassfish.jersey.media.multipart.FormDataParam; /** * A controller resource that provides the results of a test run. An XML representation of the results is obtained using diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteOverviewResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteOverviewResource.java index 35a2ec6a6..c4a36efd7 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteOverviewResource.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteOverviewResource.java @@ -11,12 +11,12 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteSetResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteSetResource.java index 7bb5c4c00..642e02d1f 100644 --- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteSetResource.java +++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestSuiteSetResource.java @@ -25,15 +25,15 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/teamengine-tests/pom.xml b/teamengine-tests/pom.xml index 6321a2bfa..2bc1344e5 100644 --- a/teamengine-tests/pom.xml +++ b/teamengine-tests/pom.xml @@ -40,7 +40,6 @@ com.smartbear.soapui soapui-maven-plugin - 5.5.0 false diff --git a/teamengine-virtualization/pom.xml b/teamengine-virtualization/pom.xml index 3da621bcf..46e03a506 100644 --- a/teamengine-virtualization/pom.xml +++ b/teamengine-virtualization/pom.xml @@ -22,7 +22,6 @@ maven-assembly-plugin - 2.6 ${basedir}/src/assembly/packer.xml @@ -46,7 +45,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 copy-dependencies @@ -66,7 +64,6 @@ com.spotify docker-maven-plugin - 0.4.10 ${docker.image.prefix}/${docker.image.name} ${project.basedir}/src/main/config/docker diff --git a/teamengine-web/pom.xml b/teamengine-web/pom.xml index eccdd9848..5196878b9 100644 --- a/teamengine-web/pom.xml +++ b/teamengine-web/pom.xml @@ -42,15 +42,21 @@ ${project.version} - com.sun.jersey - jersey-servlet + org.glassfish.jersey.containers + jersey-container-servlet ${jersey.version} runtime - commons-fileupload - commons-fileupload - 1.5 + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + runtime + + + org.apache.commons + commons-fileupload2-jakarta + 2.0.0-M1 javax.mail @@ -59,20 +65,20 @@ org.glassfish.web - javax.servlet.jsp.jstl - 1.2.3 + jakarta.servlet.jsp.jstl + 3.0.1 - javax.servlet.jsp + jakarta.servlet.jsp jsp-api - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided @@ -87,7 +93,7 @@ org.apache.tomcat tomcat-servlet-api - 7.0.69 + 10.1.11 org.opengis.cite.saxon @@ -116,7 +122,6 @@ maven-remote-resources-plugin - 1.5 ${project.groupId}:teamengine-resources:${project.version} @@ -133,7 +138,6 @@ org.apache.maven.plugins maven-war-plugin - 2.5 \ true @@ -148,9 +152,7 @@ WEB-INF/lib/teamengine-resources*.jar, WEB-INF/lib/teamengine-realm*.jar, - WEB-INF/lib/jersey-core*.jar, - WEB-INF/lib/jersey-serv*.jar, - WEB-INF/lib/jsr311-api-*.jar, + WEB-INF/lib/jakarta.ws.rs-api-*.jar, WEB-INF/lib/asm-*.jar, WEB-INF/lib/derby-*.jar, WEB-INF/lib/xercesImpl-*.jar, @@ -172,7 +174,6 @@ maven-assembly-plugin - 2.6 ${basedir}/src/assembly/common-libs.xml diff --git a/teamengine-web/src/assembly/common-libs.xml b/teamengine-web/src/assembly/common-libs.xml index 50a046dc8..0473352b1 100644 --- a/teamengine-web/src/assembly/common-libs.xml +++ b/teamengine-web/src/assembly/common-libs.xml @@ -12,8 +12,7 @@ - com.sun.jersey:jersey-* - org.apache.derby:derby + org.glassfish.jersey.*:jersey-* org.opengis.cite.teamengine:teamengine-realm xerces:xercesImpl xml-apis:xml-apis @@ -25,12 +24,5 @@ true true - - - javax.ws.rs:jsr311* - - provided - false - diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/AuthorizeTestngReportFilter.java b/teamengine-web/src/main/java/com/occamlab/te/web/AuthorizeTestngReportFilter.java index 479004ca2..83df09a1b 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/AuthorizeTestngReportFilter.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/AuthorizeTestngReportFilter.java @@ -2,14 +2,14 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class AuthorizeTestngReportFilter implements Filter { diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/DeleteSessionServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/DeleteSessionServlet.java index 08be51293..cba24a386 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/DeleteSessionServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/DeleteSessionServlet.java @@ -21,10 +21,10 @@ Northrop Grumman Corporation are Copyright (C) 2005-2006, Northrop import java.io.File; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.occamlab.te.config.Config; import com.occamlab.te.util.Misc; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/DownloadLogServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/DownloadLogServlet.java index b8b2e4e9d..5d57d6434 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/DownloadLogServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/DownloadLogServlet.java @@ -22,9 +22,9 @@ import java.io.FileInputStream; import java.io.OutputStream; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.occamlab.te.config.Config; import com.occamlab.te.util.ZipUtils; @@ -33,8 +33,8 @@ * Servlet implementation class for Servlet: DownloadLogServlet * */ -public class DownloadLogServlet extends javax.servlet.http.HttpServlet - implements javax.servlet.Servlet { +public class DownloadLogServlet extends jakarta.servlet.http.HttpServlet + implements jakarta.servlet.Servlet { Config Conf; public void init() throws ServletException { diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/EmailLogServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/EmailLogServlet.java index 1a3b3fabf..11a98a9c0 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/EmailLogServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/EmailLogServlet.java @@ -30,10 +30,10 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.occamlab.te.config.Config; import com.occamlab.te.util.ZipUtils; @@ -42,8 +42,8 @@ * Servlet implementation class for Servlet: EmailLogServlet * */ -public class EmailLogServlet extends javax.servlet.http.HttpServlet implements - javax.servlet.Servlet { +public class EmailLogServlet extends jakarta.servlet.http.HttpServlet implements + jakarta.servlet.Servlet { Config Conf; public void init() throws ServletException { diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/LogoutServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/LogoutServlet.java index d86d09ccc..fa2834515 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/LogoutServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/LogoutServlet.java @@ -7,10 +7,10 @@ */ package com.occamlab.te.web; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Handles (GET) requests to log out and terminate a test session. diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/MonitorServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/MonitorServlet.java index 1fdcd74f1..77d9d12cc 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/MonitorServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/MonitorServlet.java @@ -31,10 +31,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/PrettyPrintLogsServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/PrettyPrintLogsServlet.java index 99053e3f7..c02956bbc 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/PrettyPrintLogsServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/PrettyPrintLogsServlet.java @@ -14,11 +14,11 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.occamlab.te.config.Config; import com.occamlab.te.util.DocumentationHelper; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/RegistrationHandlerServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/RegistrationHandlerServlet.java index 7b4168181..425becddb 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/RegistrationHandlerServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/RegistrationHandlerServlet.java @@ -18,10 +18,10 @@ Northrop Grumman Corporation are Copyright (C) 2005-2006, Northrop ****************************************************************************/ package com.occamlab.te.web; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.occamlab.te.config.Config; import com.occamlab.te.realm.PasswordStorage; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/TestServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/TestServlet.java index 87eee8c48..afab72dfd 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/TestServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/TestServlet.java @@ -34,12 +34,12 @@ C. Heazel (WiSC): Added Fortify adjudication changes import java.util.Map.Entry; import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; @@ -54,10 +54,10 @@ C. Heazel (WiSC): Added Fortify adjudication changes import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltTransformer; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileItemFactory; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; +import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload; import org.apache.commons.io.FileUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -245,13 +245,13 @@ public void process(HttpServletRequest request, HttpServletResponse response) throws ServletException { try { FileItemFactory ffactory; - ServletFileUpload upload; + JakartaServletFileUpload upload; List items = null; HashMap params = new HashMap(); - boolean multipart = ServletFileUpload.isMultipartContent(request); + boolean multipart = JakartaServletFileUpload.isMultipartContent(request); if (multipart) { - ffactory = new DiskFileItemFactory(); - upload = new ServletFileUpload(ffactory); + ffactory = new DiskFileItemFactory.Builder().get(); + upload = new JakartaServletFileUpload(ffactory); items = upload.parseRequest(request); Iterator iter = items.iterator(); while (iter.hasNext()) { @@ -437,7 +437,7 @@ public void process(HttpServletRequest request, HttpServletResponse response) File uploadedFile = new File(tempDir, StringUtils.getFilenameFromString(item .getName())); - item.write(uploadedFile); + item.write(uploadedFile.toPath()); Element valueElement = doc.createElement("value"); String key = item.getFieldName(); valueElement.setAttribute("key", key); diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/ViewLogServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/ViewLogServlet.java index fcf799b92..9e2f8d6a9 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/ViewLogServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/ViewLogServlet.java @@ -23,10 +23,10 @@ C. Heazel (WiSC): Added Fortify adjudication changes import java.io.OutputStreamWriter; import java.util.ArrayList; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.transform.Templates; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/ViewTestServlet.java b/teamengine-web/src/main/java/com/occamlab/te/web/ViewTestServlet.java index 89fa92deb..94c3dad9c 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/ViewTestServlet.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/ViewTestServlet.java @@ -22,10 +22,10 @@ C. Heazel (WiSC): Added Fortify adjudication changes import java.io.File; import java.net.URL; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CleartextPasswordContextListener.java b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CleartextPasswordContextListener.java index 404ef1927..81bbd60d1 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CleartextPasswordContextListener.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/CleartextPasswordContextListener.java @@ -12,9 +12,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/teamengine-web/src/main/java/com/occamlab/te/web/listeners/TEServletContextListener.java b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/TEServletContextListener.java index 573f829b9..437774042 100644 --- a/teamengine-web/src/main/java/com/occamlab/te/web/listeners/TEServletContextListener.java +++ b/teamengine-web/src/main/java/com/occamlab/te/web/listeners/TEServletContextListener.java @@ -9,9 +9,9 @@ import com.occamlab.te.SetupOptions; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import java.io.File; diff --git a/teamengine-web/src/main/resources/logging.properties b/teamengine-web/src/main/resources/logging.properties index 23a11904a..87f57b5ba 100644 --- a/teamengine-web/src/main/resources/logging.properties +++ b/teamengine-web/src/main/resources/logging.properties @@ -1,6 +1,6 @@ # JDK logging configuration for Tomcat -# See http://tomcat.apache.org/tomcat-7.0-doc/logging.html -handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler +# See https://tomcat.apache.org/tomcat-10.1-doc/logging.html +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler .handlers = java.util.logging.ConsoleHandler diff --git a/teamengine-web/src/main/webapp/META-INF/context.xml b/teamengine-web/src/main/webapp/META-INF/context.xml index 2ea5e8df7..180428908 100644 --- a/teamengine-web/src/main/webapp/META-INF/context.xml +++ b/teamengine-web/src/main/webapp/META-INF/context.xml @@ -1,21 +1,35 @@ - + - + ${TE_BASE}/config.xml ${TE_BASE}/scripts - + + + + + + + diff --git a/teamengine-web/src/main/webapp/WEB-INF/web.xml b/teamengine-web/src/main/webapp/WEB-INF/web.xml index 6000da2ec..08a657d1c 100644 --- a/teamengine-web/src/main/webapp/WEB-INF/web.xml +++ b/teamengine-web/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,5 @@ - + TEAM Engine Test Harness Provides a web interface for executing test suites and viewing test results. @@ -67,22 +67,16 @@ TestSuiteController - com.sun.jersey.spi.container.servlet.ServletContainer + org.glassfish.jersey.servlet.ServletContainer - http://jersey.java.net/nonav/apidocs/latest/jersey/com/sun/jersey/spi/container/servlet/ServletContainer.html - javax.ws.rs.Application + jakarta.ws.rs.Application com.occamlab.te.spi.jaxrs.ApplicationComponents - - http://jersey.java.net/nonav/apidocs/latest/jersey/com/sun/jersey/api/core/ResourceConfig.html#FEATURE_REDIRECT - com.sun.jersey.config.feature.Redirect - false - 1 Ensures that the file reaper thread (which deletes temp files) is terminated when the web application is shut down. - org.apache.commons.fileupload.servlet.FileCleanerCleanup + org.apache.commons.fileupload2.jakarta.JakartaFileCleaner TestSuiteController @@ -128,7 +122,7 @@ ReportFilter /reports/* - + AuthenticationFilter com.occamlab.te.realm.RestAuthenticationFilter