Skip to content
Open
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
157 changes: 26 additions & 131 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,9 @@
<job.name>${project.artifactId}</job.name>
<skipTests>true</skipTests>
<test.excludes>**/*Test.java.bogus</test.excludes>

<kfs.version>2024-09-25</kfs.version>

<backport-util-concurrent.version>2.2</backport-util-concurrent.version>
<checkstyle.version>10.17.0</checkstyle.version>
<!-- CU customization to continue support for commons-digester after KualiCo has removed it from base code;
This can be removed once all code has been updated to use jaxb or other framework to replace commons-digester.
-->
<commons-digester3.version>3.2</commons-digester3.version>
<commons-validator.version>1.9.0</commons-validator.version>
<gson.version>2.10.1</gson.version>
Expand Down Expand Up @@ -304,97 +299,20 @@
</build>
<repositories>
<repository>
<id>cornell-internal</id>
<url>https://maven.cit.cornell.edu/repository/internal</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/kualico/financials</url>
</repository>
<repository>
<id>cornell-external</id>
<url>https://maven.cit.cornell.edu/repository/external</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>cornell-snapshots</id>
<url>https://maven.cit.cornell.edu/repository/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
<repository>
<id>kualico.nexus.financials.releases</id>
<name>KualiCo Nexus Financials</name>
<url>https://nexus.kuali.co/nexus/content/repositories/financials-repos/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>kualico.nexus.financials.snapshots</id>
<name>KualiCo Nexus Snapshots Financials</name>
<url>https://nexus.kuali.co/nexus/content/repositories/financials-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>cornell-internal</id>
<url>https://maven.cit.cornell.edu/repository/internal</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>cornell-external</id>
<url>https://maven.cit.cornell.edu/repository/external</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>cornell-snapshots</id>
<url>https://maven.cit.cornell.edu/repository/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>kualico.nexus.financials.releases</id>
<name>KualiCo Nexus Financials</name>
<url>https://nexus.kuali.co/nexus/content/repositories/financials-repos/</url>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/kualico/financials</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
Expand All @@ -403,18 +321,6 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
<pluginRepository>
<id>kualico.nexus.financials.snapshots</id>
<name>KualiCo Nexus Snapshots Financials</name>
<url>https://nexus.kuali.co/nexus/content/repositories/financials-snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
Expand Down Expand Up @@ -958,6 +864,15 @@
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
<!-- CORBA libraries unavailable from defunct nexus.kuali.org repo; not needed for KFS -->
Comment thread
cah292 marked this conversation as resolved.
<exclusion>
<groupId>org.jacorb</groupId>
<artifactId>jacorb</artifactId>
</exclusion>
<exclusion>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-idl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -1086,6 +1001,15 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<!-- SDO plugin pulls in commonj.sdo from defunct maven.java.net repo; not needed for KFS -->
Comment thread
cah292 marked this conversation as resolved.
<exclusion>
<groupId>com.sun.xml.ws</groupId>
<artifactId>sdo-eclipselink-plugin</artifactId>
</exclusion>
<exclusion>
<groupId>commonj.sdo</groupId>
<artifactId>commonj.sdo</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -1220,11 +1144,6 @@
</exclusion>
</exclusions>
</dependency>

<!--
Start of CXF dependencies. These should be removed after we rewrite
the Account Verification Web Service to use a different framework.
-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
Expand Down Expand Up @@ -1678,14 +1597,6 @@
</exclusion>
</exclusions>
</dependency>
<!--
End of CXF dependencies.
-->

<!--
Start of JAX-RS dependencies. These should be removed after we convert
all of our JAX-RS-dependent code to use Spring MVC and/or HTTP Core/Client.
-->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
Expand Down Expand Up @@ -1774,10 +1685,6 @@
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta.el.el-api.version}</version>
</dependency>
<!--
End of JAX-RS dependencies.
-->

<dependency>
<groupId>com.prowidesoftware</groupId>
<artifactId>pw-iso20022</artifactId>
Expand Down Expand Up @@ -1808,16 +1715,4 @@
<scope>test</scope>
</dependency>
</dependencies>
<distributionManagement>
<repository>
<id>cornell-internal</id>
<url>https://nexus.kuali.cucloud.net/nexus/content/repositories/internal</url>
</repository>
<snapshotRepository>
<id>cornell-snapshots</id>
<name>cornell-snapshots</name>
<uniqueVersion>true</uniqueVersion>
<url>https://nexus.kuali.cucloud.net/nexus/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>
Comment thread
cah292 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public class SupplierSyncMessageCornellTest extends SupplierSyncMessageTestBase
private static final String RESPONSE_GOOD_FILE_EXAMPLE = "SupplierSyncMessage-ResponseMessage-CornellTestData-response-good.xml";
private static final String RESPONSE_BAD_FILE_EXAMPLE = "SupplierSyncMessage-ResponseMessage-CornellTestData-response-bad.xml";

protected String buildFullOutputFilePath() {
return "test/SupplierSyncMessageCornellTest/";
}

@ParameterizedTest
@MethodSource("testSupplierSyncMessageArguments")
void testSupplierSyncMessage(String fileName, boolean requestTest, boolean goodResponseStatus) throws JAXBException, IOException, SAXException {
Expand All @@ -56,7 +60,7 @@ void testSupplierSyncMessage(String fileName, boolean requestTest, boolean goodR
supplierSyncMessage.setHeader(buildResponseHeader());
}

File actualXmlFile = marshalService.marshalObjectToXMLFragment(supplierSyncMessage, OUTPUT_FILE_PATH + "test.xml");
File actualXmlFile = marshalService.marshalObjectToXMLFragment(supplierSyncMessage, buildFullOutputFilePath() + "test.xml");
CuXMLUnitTestUtils.compareXML(expectedRequestXmlFile, actualXmlFile);
validateFileContainsExpectedHeader(actualXmlFile);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ public class SupplierSyncMessageJaggaerTest extends SupplierSyncMessageTestBase
private static final String TEXT_OF_ERROR_MESSAGE = "Text of error message";
private static final String REQUEST_FILE_EXAMPLE = "SupplierSyncMessage-RequestMessage-JaggaerTestData.xml";
private static final String RESPONSE_FILE_EXAMPLE = "SupplierSyncMessage-ResponseMessage-JaggaerTestData.xml";

protected String buildFullOutputFilePath() {
return "test/SupplierSyncMessageJaggaerTest/";
}

@ParameterizedTest
@MethodSource("testSupplierSyncMessageArguments")
Expand All @@ -38,7 +42,7 @@ void testSupplierSyncMessage(String fileName, boolean requestTest) throws JAXBEx
supplierSyncMessage.getSupplierSyncMessageItems().add(buildSupplierResponseMessage());
}

File actualXmlFile = marshalService.marshalObjectToXMLFragment(supplierSyncMessage, OUTPUT_FILE_PATH + "test.xml");
File actualXmlFile = marshalService.marshalObjectToXMLFragment(supplierSyncMessage, buildFullOutputFilePath() + "test.xml");
CuXMLUnitTestUtils.compareXML(expectedRequestXmlFile, actualXmlFile);
validateFileContainsExpectedHeader(actualXmlFile);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

public abstract class SupplierSyncMessageTestBase {
protected static final String INPUT_FILE_PATH = "src/test/resources/edu/cornell/kfs/module/purap/jaggaer/xml/";
protected static final String OUTPUT_FILE_PATH = "test/jaggaer/supplierSynchMessageTest/";
protected CUMarshalService marshalService;

private File outputFileDirectory;
Expand All @@ -34,9 +33,11 @@ public abstract class SupplierSyncMessageTestBase {
protected void setUp() throws Exception {
Configurator.setLevel(CUMarshalServiceImpl.class, Level.DEBUG);
marshalService = new CUMarshalServiceImpl();
outputFileDirectory = new File(OUTPUT_FILE_PATH);
outputFileDirectory = new File(buildFullOutputFilePath());
FileUtils.forceMkdir(outputFileDirectory);
}

protected abstract String buildFullOutputFilePath();

@AfterEach
protected void tearDown() throws Exception {
Expand Down