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.

Sign up for GitHub

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

Closes #575 #594

Closed
wants to merge 24 commits into from
Closed

Closes #575 #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
239b3fc
#511 - Set compiler plugin to Java 17, upgrade maven-war-plugin and a…
dstenger Apr 6, 2023
1b05069
#511 - Set mockito to v5.2.0 and equalsverifier to v3.14.1
dstenger Apr 6, 2023
efe2fd2
#511 - Set maven-site-plugin to v3.12.1, doxia-module-markdown to v1.…
dstenger Apr 12, 2023
db8598e
Merge remote-tracking branch 'origin/master' into 6.0
dstenger Apr 26, 2023
17cb706
#574 - Update Maven plugins to latest versions
dstenger Apr 26, 2023
63efe92
#511 - Update maven-pdf-plugin to v1.6.1
dstenger Apr 26, 2023
ca8ff49
#511 - Remove obsolete content from assembly/common-libs.xml
dstenger Apr 27, 2023
aa36116
#511 - Refactor deprecated code
dstenger Apr 27, 2023
58962f7
#511 - Correct order of arguments in assertEquals
dstenger Apr 27, 2023
b6b0c32
#511 - Remove duplicate configuration and executions of maven-javadoc…
dstenger Apr 27, 2023
3c7a11d
#578 - Remove maven-pdf-plugin
dstenger May 4, 2023
5585c33
Update context.xml to be usable with newer Tomcat versions (#556)
dstenger May 4, 2023
7c499ad
#556 - Set tomcat dependencies to version 9 and update related code
dstenger Aug 28, 2023
730ed41
#556 - Replace aliases by PreResources
dstenger Aug 28, 2023
2bea390
#556 - Remove root from PBKDF2Realm
dstenger Aug 28, 2023
e025237
#556 - Rename maxActive to maxTotal
dstenger Aug 28, 2023
88342eb
#556 - Remove processTlds=false
dstenger Aug 28, 2023
5b61c03
#556 - Migration to JAX-RS 2.1 and Jersey 2.40
dstenger Sep 1, 2023
a4b0f73
#556 - Set dependency tomcat-catalina to version 10.1.11 and update i…
dstenger Sep 30, 2023
6c9c85b
#556 - Upgrade to servlet api version 6.0
dstenger Oct 4, 2023
e989720
#556 - Migrate to JAX-RS 3.1 and Jersey 3.1.3
dstenger Oct 4, 2023
b697f3a
#556 - Migrate to JAXB 4.0
dstenger Oct 4, 2023
5474500
#556 - Fix problems with REST interface
dstenger Oct 5, 2023
288148a
Use 24 bit png image fo parsePNG_noAlphaChannel() test
bpross-52n Nov 10, 2023
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
121 changes: 45 additions & 76 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
<saxon.version>9.0.0.8</saxon.version>
<jersey.version>1.19</jersey.version>
<mockito.version>1.10.19</mockito.version>
<jersey.version>3.1.3</jersey.version>
<mockito.version>5.2.0</mockito.version>
</properties>

<modules>
Expand Down Expand Up @@ -124,7 +124,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
Expand Down Expand Up @@ -156,23 +156,28 @@
<artifactId>schema-utils</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.6</version>
<version>3.12.1</version>
<executions>
<execution>
<id>site-package</id>
Expand All @@ -186,12 +191,12 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
<version>1.7</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.3</version>
<version>2.2.3</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -200,40 +205,10 @@
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pdf-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<id>pdf</id>
<phase>site</phase>
<goals>
<goal>pdf</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/pdf</outputDirectory>
<includeReports>false</includeReports>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.3</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.0</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
Expand All @@ -243,7 +218,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<version>3.2.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
Expand All @@ -255,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>3.0.0</version>
<configuration>
<!-- Disable TestNG runner (enabled due to compile dependency) -->
<testNGArtifactName>null:null</testNGArtifactName>
Expand All @@ -269,7 +244,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -287,39 +262,10 @@
<artifactId>maven-repository-plugin</artifactId>
<version>2.4</version>
</plugin>
<!--
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<versionRange>[1.5,)</versionRange>
<goals>
<goal>bundle</goal>
<goal>process</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>3.0.0</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down Expand Up @@ -352,6 +298,29 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>com.smartbear.soapui</groupId>
<artifactId>soapui-maven-plugin</artifactId>
<version>5.7.0</version>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand All @@ -360,7 +329,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.9</version>
<version>3.4.3</version>
<reportSets>
<reportSet>
<reports>
Expand Down Expand Up @@ -399,7 +368,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -419,7 +388,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down
2 changes: 0 additions & 2 deletions teamengine-console/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.5</version>
<configuration>
<resourceBundles>
<resourceBundle>${project.groupId}:teamengine-resources:${project.version}</resourceBundle>
Expand All @@ -52,7 +51,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<configuration>
<descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
Expand Down
15 changes: 1 addition & 14 deletions teamengine-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>2.5.2</version>
<version>3.14.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -123,19 +123,6 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<show>package</show>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
34 changes: 18 additions & 16 deletions teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
Expand Down Expand Up @@ -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 );

Expand Down Expand Up @@ -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;
Expand Down
12 changes: 7 additions & 5 deletions teamengine-core/src/main/java/com/occamlab/te/parsers/ImageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -237,7 +239,7 @@ private static void processBufferedImage(BufferedImage buffimage,
sampleMap = new HashMap<Object, Object>();
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
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
}
}
Expand Down Expand Up @@ -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);
}
Expand Down
Loading