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 #94 #97

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

Closes #94 #97

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
9b2d9b8
Use Java 17 and Tomcat 10.1
bpross-52n Jan 18, 2024
012eada
Prepare for use of TestNG 7.9.0
bpross-52n Jan 18, 2024
ebb7490
Merge branch 'master' into java17Tomcat101TeamEngine6
bpross-52n Nov 21, 2024
1fb5ed5
Fix build issues
bpross-52n Nov 22, 2024
d858e3c
Fix issue with resource filtering
bpross-52n Nov 22, 2024
e334079
Remove unnec in-/exclusions
bpross-52n Nov 22, 2024
996dbe3
Javadoc, formatting
bpross-52n Nov 22, 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
198 changes: 35 additions & 163 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
<version>9</version>
<version>13</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ets-ogcapi-processes10</artifactId>
<version>1.3-SNAPSHOT</version>
<packaging>jar</packaging>
Expand Down Expand Up @@ -49,37 +48,43 @@
<properties>
<ets-code>ogcapi-processes-1.0</ets-code>
<spec-version>0.1</spec-version>
<docker.teamengine.version>5.7</docker.teamengine.version>
<docker.teamengine.version>6.0</docker.teamengine.version>
<spec-version>1.0</spec-version>
</properties>

<dependencies>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-spi</artifactId>
<version>5.7</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.opengis.cite</groupId>
<artifactId>schema-utils</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</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>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openapi4j</groupId>
Expand All @@ -89,47 +94,28 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.0.66</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please move the definition of the version to ets-common?

</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 @@ -138,85 +124,10 @@
<mainClass>org.opengis.cite.ogcapiprocesses10.TestNGController</mainClass>
</manifest>
</archive>
<descriptors>
<descriptor>${basedir}/src/assembly/deps.xml</descriptor>
<descriptor>${basedir}/src/assembly/ctl-scripts.xml</descriptor>
<descriptor>${basedir}/src/assembly/aio.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</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>
<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>
<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>
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>0.0.29</version>
<executions>
<execution>
<phase>validate</phase>
<inherited>true</inherited>
<goals>
<goal>validate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
Expand Down Expand Up @@ -266,36 +177,23 @@
</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>
</plugins>
</pluginManagement>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/testdata/*.*</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/javadoc</directory>
<filtering>true</filtering>
<targetPath>doc/${ets-code}/${project.version}</targetPath>
</resource>
</resources>
</build>

<profiles>
Expand Down Expand Up @@ -372,32 +270,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>

<distributionManagement>
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>
8 changes: 5 additions & 3 deletions src/assembly/deps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<dependencySets>
<dependencySet>
<includes>
<include>com.sun.jersey:jersey-client</include>
<include>org.opengis.cite:schema-utils</include>
</includes>
<outputDirectory>/</outputDirectory>
Expand All @@ -23,8 +22,11 @@
<dependencySet>
<excludes>
<exclude>org.opengis.cite.teamengine:teamengine-spi</exclude>
<exclude>com.sun.jersey:jersey-client</exclude>
<exclude>org.opengis.cite:schema-utils</exclude>
<exclude>*:jersey-client</exclude>
<exclude>*:jersey-server</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
<exclude>com.beust:jcommander</exclude>
<exclude>org.testng:testng</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<unpack>false</unpack>
Expand Down
4 changes: 3 additions & 1 deletion src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM tomcat:7.0-jre8
FROM tomcat:10.1-jre17

MAINTAINER Dirk Stenger <[email protected]>
MAINTAINER Torsten Friebe <[email protected]>

RUN apt update && apt install -y unzip

# add TEAM engine webapp
ADD maven/dependency/teamengine-web-*.war /root/
RUN cd /root/ && unzip -q teamengine-web-*.war -d /usr/local/tomcat/webapps/teamengine
Expand Down
27 changes: 26 additions & 1 deletion src/main/java/org/opengis/cite/ogcapiprocesses10/CommandLineArguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@
* <pre>
* ets-${ets-code}-${version}-aio.jar [-o|--outputDir $TMPDIR] [-d|--deleteSubjectOnFinish] [test-run-props.xml]
* </pre>
*
* @author bpr
*/
public class CommandLineArguments {

@Parameter(description = "Properties file")
private final List<String> xmlProps;
private List<String> xmlProps;

@Parameter(names = { "-o", "--outputDir" }, description = "Output directory")
private String outputDir;
Expand All @@ -35,10 +37,21 @@ public class CommandLineArguments {
description = "Delete file containing representation of test subject when finished")
private boolean deleteSubjectOnFinish = false;

/**
* <p>
* Constructor for CommandLineArguments.
* </p>
*/
public CommandLineArguments() {
this.xmlProps = new ArrayList<>();
}

/**
* <p>
* getPropertiesFile.
* </p>
* @return a {@link java.io.File} object
*/
public File getPropertiesFile() {
File fileRef;
if (xmlProps.isEmpty()) {
Expand All @@ -51,10 +64,22 @@ public File getPropertiesFile() {
return fileRef;
}

/**
* <p>
* Getter for the field <code>outputDir</code>.
* </p>
* @return a {@link java.lang.String} object
*/
public String getOutputDir() {
return (null != outputDir) ? outputDir : System.getProperty("user.home");
}

/**
* <p>
* doDeleteSubjectOnFinish.
* </p>
* @return a boolean
*/
public boolean doDeleteSubjectOnFinish() {
return deleteSubjectOnFinish;
}
Expand Down
Loading