Skip to content

Commit 39c5d61

Browse files
[Major] Move javax -> jakarta packaging (#289)
* jakarta conversion * updated library versions * jakarta.annotation * JdkClientConnection * runtime dependencies in package assembly * Update permissions and favicon
1 parent b8b2eda commit 39c5d61

File tree

459 files changed

+1744
-1683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+1744
-1683
lines changed

agent/agent_common/src/main/java/com/intuit/tank/http/soap/SOAPRequest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.intuit.tank.http.soap;
22

3-
import javax.xml.soap.MessageFactory;
4-
import javax.xml.soap.SOAPBody;
5-
import javax.xml.soap.SOAPEnvelope;
6-
import javax.xml.soap.SOAPMessage;
7-
import javax.xml.soap.SOAPPart;
3+
import jakarta.xml.soap.MessageFactory;
4+
import jakarta.xml.soap.SOAPBody;
5+
import jakarta.xml.soap.SOAPEnvelope;
6+
import jakarta.xml.soap.SOAPMessage;
7+
import jakarta.xml.soap.SOAPPart;
88

99
/*
1010
* #%L

agent/agent_common/src/test/java/com/intuit/tank/http/multipart/MultiPartRequestTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static Stream<Arguments> data() {
3838
+ "\r\n"
3939
+ "\r\n"
4040
+ "-----------------------------10681713301939738037227942752" + "\r\n"
41-
+ "Content-Disposition: form-data; name=\"javax.faces.ViewState\"" + "\r\n"
41+
+ "Content-Disposition: form-data; name=\"jakarta.faces.ViewState\"" + "\r\n"
4242
+ "\r\n"
4343
+ "-1346138416504364622:5284803266475066700" + "\r\n"
4444
+ "-----------------------------10681713301939738037227942752--" + "\r\n", 4 ),

agent/agent_standalone/src/main/java/com/intuit/tank/standalone/agent/CommandListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.io.OutputStream;
1919
import java.net.InetSocketAddress;
2020

21-
import javax.xml.bind.JAXBContext;
22-
import javax.xml.bind.JAXBException;
21+
import jakarta.xml.bind.JAXBContext;
22+
import jakarta.xml.bind.JAXBException;
2323
import javax.xml.parsers.ParserConfigurationException;
2424
import javax.xml.parsers.SAXParserFactory;
2525
import javax.xml.transform.Source;

agent/agent_standalone_pkg/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
<artifactId>agent-standalone</artifactId>
2020
<version>${project.version}</version>
2121
</dependency>
22-
22+
<dependency>
23+
<groupId>org.openjdk.nashorn</groupId>
24+
<artifactId>nashorn-core</artifactId>
25+
<scope>runtime</scope>
26+
</dependency>
2327
</dependencies>
2428

2529
<build>

agent/apiharness/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<exclusions>
2929
<exclusion>
3030
<groupId>org.springdoc</groupId>
31-
<artifactId>springdoc-openapi-ui</artifactId>
31+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
3232
</exclusion>
3333
<exclusion>
3434
<groupId>${project.groupId}</groupId>
@@ -107,10 +107,14 @@
107107
<version>${project.version}</version>
108108
</dependency>
109109

110+
<dependency>
111+
<groupId>org.glassfish.jaxb</groupId>
112+
<artifactId>jaxb-runtime</artifactId>
113+
</dependency>
114+
110115
<dependency>
111116
<groupId>org.openjdk.nashorn</groupId>
112117
<artifactId>nashorn-core</artifactId>
113-
<scope>runtime</scope>
114118
</dependency>
115119
</dependencies>
116120
</project>

agent/apiharness/src/main/java/com/intuit/tank/harness/functions/DateFunctions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Calendar;
1919
import java.util.Date;
2020

21-
import javax.annotation.Nullable;
21+
import jakarta.annotation.Nullable;
2222

2323
import org.apache.commons.lang3.StringUtils;
2424
import org.apache.logging.log4j.LogManager;

agent/apiharness/src/main/java/com/intuit/tank/harness/logging/LogUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.intuit.tank.logging.LoggingProfile;
2727
import org.apache.logging.log4j.message.ObjectMessage;
2828

29-
import javax.annotation.Nonnull;
29+
import jakarta.annotation.Nonnull;
3030

3131
/**
3232
* LogUtil

agent/apiharness/src/main/java/com/intuit/tank/harness/parsers/WorkloadParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.io.Reader;
2525
import java.io.StringReader;
2626

27-
import javax.xml.bind.JAXBContext;
27+
import jakarta.xml.bind.JAXBContext;
2828
import javax.xml.parsers.SAXParserFactory;
2929
import javax.xml.transform.Source;
3030
import javax.xml.transform.sax.SAXSource;

agent/apiharness/src/main/java/com/intuit/tank/runner/TestStepContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.ArrayList;
1717
import java.util.List;
1818

19-
import javax.annotation.Nonnull;
19+
import jakarta.annotation.Nonnull;
2020

2121
import com.intuit.tank.harness.data.TestStep;
2222
import com.intuit.tank.harness.test.data.Variables;

agent/apiharness/src/main/java/com/intuit/tank/runner/method/LogicRunner.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

19-
import javax.script.ScriptEngineManager;
20-
2119
import org.apache.logging.log4j.LogManager;
2220
import org.apache.logging.log4j.Logger;
2321

@@ -31,6 +29,7 @@
3129
import com.intuit.tank.tools.script.ScriptRunner;
3230
import com.intuit.tank.vm.common.LogicScriptUtil;
3331
import com.intuit.tank.vm.common.TankConstants;
32+
import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory;
3433

3534
class LogicRunner implements Runner {
3635
private static Logger LOG = LogManager.getLogger(LogicRunner.class);
@@ -60,7 +59,7 @@ public String execute() {
6059
String scriptToRun = new LogicScriptUtil().buildScript(step.getScript());
6160
try {
6261
ScriptIOBean ioBean = new ScriptRunner().runScript(step.getName(), scriptToRun,
63-
new ScriptEngineManager().getEngineByExtension("js"), inputs, outputLogger);
62+
new NashornScriptEngineFactory().getScriptEngine(), inputs, outputLogger);
6463
String action = (String) ioBean.getOutput("action");
6564
if (action != null) {
6665
ret = handleAction(action);

0 commit comments

Comments
 (0)