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

Jump to bottom

Closes #235 #259

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Closes #235 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d205a1c
Modify Dockerfile to use Java 17 and Tomcat 10 and set docker.teameng…
dstenger May 4, 2023
8ad7c12
Merge branch 'master' into java17Tomcat10TeamEngine6
bpross-52n Nov 27, 2024
96d8961
Fix build errors
bpross-52n Nov 27, 2024
c481e18
Formatting
bpross-52n Nov 27, 2024
211d5b0
Fix javadoc
bpross-52n Nov 27, 2024
67d2b7f
Re-format after fixing javadoc
bpross-52n Nov 27, 2024
64a5a50
Adjust assembly files
bpross-52n Nov 27, 2024
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
177 changes: 15 additions & 162 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
<version>9</version>
<version>13</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-ogcapi-features10</artifactId>
<version>1.8-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<packaging>jar</packaging>

<name>OGC API-Features 1.0 Conformance Test Suite</name>
Expand Down Expand Up @@ -50,15 +49,15 @@
<properties>
<ets-code>ogcapi-features-1.0</ets-code>
<spec-version>1.0</spec-version>
<docker.teamengine.version>5.4.1</docker.teamengine.version>
<docker.teamengine.version>6.0-SNAPSHOT</docker.teamengine.version>
<soapui.test.fail.ignore>false</soapui.test.fail.ignore>
<soapui.teamengine.endpoint>http://localhost:8081/teamengine</soapui.teamengine.endpoint>
<soapui.teamengine.user>ogctest</soapui.teamengine.user>
<soapui.teamengine.password>ogctest</soapui.teamengine.password>
<soapui.iut>https://ri.ldproxy.net/daraa</soapui.iut>
<soapui.tests.passed>383</soapui.tests.passed>
<soapui.tests.skipped>15</soapui.tests.skipped>
<soapui.tests.failed>3</soapui.tests.failed>
<soapui.iut>https://demo.ldproxy.net/daraa</soapui.iut>
<soapui.tests.passed>401</soapui.tests.passed>
<soapui.tests.skipped>0</soapui.tests.skipped>
<soapui.tests.failed>0</soapui.tests.failed>
</properties>

<dependencies>
Expand All @@ -69,7 +68,6 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>org.locationtech.proj4j</groupId>
Expand All @@ -81,24 +79,13 @@
<artifactId>jts-io-common</artifactId>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>4.5.1</version>
</dependency>
<dependency>
<groupId>com.reprezen.kaizen</groupId>
<artifactId>openapi-parser</artifactId>
<version>4.0.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -123,62 +110,35 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.81</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<source>8</source>
<docfilessubdirs>true</docfilessubdirs>
<show>package</show>
<links>
<link>http://testng.org/javadocs/</link>
</links>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand All @@ -202,59 +162,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
<executions>
<execution>
<id>site-package</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.7.1</version>
</dependency>
</dependencies>
<configuration>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>1.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -302,34 +209,6 @@
</images>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-web</artifactId>
<version>${docker.teamengine.version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-web</artifactId>
<version>${docker.teamengine.version}</version>
<classifier>common-libs</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-console</artifactId>
<version>${docker.teamengine.version}</version>
<classifier>base</classifier>
<type>zip</type>
</artifactItem>
</artifactItems>
</configuration>
</plugin>
<plugin>
<groupId>com.smartbear.soapui</groupId>
<artifactId>soapui-maven-plugin</artifactId>
Expand Down Expand Up @@ -461,32 +340,6 @@
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<pluginRepositories>
Expand Down
3 changes: 0 additions & 3 deletions src/assembly/aio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<exclude>com.sun.jersey:jersey-server</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
10 changes: 4 additions & 6 deletions src/assembly/deps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<includes>
<include>com.sun.jersey:jersey-client</include>
</includes>
<outputDirectory>/</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
Expand All @@ -22,10 +19,11 @@
<dependencySet>
<excludes>
<exclude>org.opengis.cite.teamengine:teamengine-spi</exclude>
<exclude>com.sun.jersey:jersey-client</exclude>
<exclude>com.beust:jcommander</exclude>
<exclude>com.sun.jersey:jersey-core</exclude>
<exclude>javax.ws.rs:jsr311-api</exclude>
<exclude>*:jersey-client</exclude>
<exclude>*:jersey-server</exclude>
<exclude>*:jersey-hk2</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>org.testng:testng</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
Expand Down
3 changes: 2 additions & 1 deletion src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM tomcat:7.0-jre8 as builder
FROM tomcat:10-jre17
RUN apt update && apt install -y unzip

# add TEAM engine webapp
ADD maven/dependency/teamengine-web-*.war /root/
Expand Down
Loading