Skip to content

Commit

Permalink
#55 - Include updated ets-common and refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstenger
dstenger committed Oct 17, 2024
1 parent 61c8a94 commit 1ab5d27
Show file tree
Hide file tree
Showing 61 changed files with 5,694 additions and 6,216 deletions.
147 changes: 24 additions & 123 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">

<parent>
<groupId>org.opengis.cite</groupId>
Expand All @@ -16,17 +17,17 @@
"OGC Catalogue Services 3.0 Specification -- HTTP Protocol Binding" (OGC
12-176r6) and related specifications.
</description>
<url>http://opengeospatial.github.io/ets-cat30/</url>
<url>https://opengeospatial.github.io/ets-cat30/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://opensource.org/licenses/Apache-2.0</url>
<url>https://opensource.org/licenses/Apache-2.0</url>
</license>
</licenses>

<organization>
<name>Open Geospatial Consortium</name>
<url>http://www.opengeospatial.org/</url>
<url>https://www.ogc.org/</url>
</organization>
<scm>
<connection>scm:git:https://github.com/opengeospatial/ets-cat30.git</connection>
Expand All @@ -44,6 +45,11 @@
<url>https://github.com/rjmartell</url>
<timezone>Canada/Pacific</timezone>
</developer>
<developer>
<name>D. Stenger</name>
<url>https://github.com/dstenger</url>
<timezone>Europe/Berlin</timezone>
</developer>
</developers>

<properties>
Expand All @@ -60,13 +66,6 @@
<docker.teamengine.version>6.0.0-RC1</docker.teamengine.version>
</properties>

<pluginRepositories>
<pluginRepository>
<id>smartbear-sweden-plugin-repository</id>
<url>https://www.soapui.org/repository/maven2/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.opengis.cite</groupId>
Expand Down Expand Up @@ -114,8 +113,8 @@
<artifactId>jersey-media-jaxb</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -147,10 +146,10 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -163,81 +162,27 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<archive>
<manifest>
<mainClass>org.opengis.cite.cat30.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>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.smartbear.soapui</groupId>
<artifactId>soapui-maven-plugin</artifactId>
<version>5.7.2</version>
<dependencies>
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
<version>1.2.1</version>
</dependency>
</dependencies>
<configuration>
<projectFile>src/test/resources/soapui/ets-cat30-soapui-project.xml</projectFile>
<settingsFile>src/test/resources/soapui/ets-cat30-soapui-settings.xml</settingsFile>
<outputFolder>${project.build.directory}/soapui</outputFolder>
<junitReport>true</junitReport>
<testFailIgnore>${soapui.test.fail.ignore}</testFailIgnore>
<projectProperties>
<value>teamengine.endpoint=${soapui.teamengine.endpoint}</value>
Expand All @@ -253,31 +198,13 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.43.4</version>
<configuration>
<images>
<image>
<name>ogccite/${project.artifactId}</name>
<build>
<dockerFileDir>${project.basedir}/src/docker</dockerFileDir>
<tags>
<tag>${project.version}-teamengine-${docker.teamengine.version}</tag>
</tags>
<assembly>
<inline>
<fileSets>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>dependency/*teamengine-*.war</include>
<include>dependency/*teamengine-*.zip</include>
<include>*ets-*.zip</include>
</includes>
</fileSet>
</fileSets>
</inline>
</assembly>
</build>
<run>
<ports>
Expand All @@ -296,7 +223,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<artifactItems>
<artifactItem>
Expand Down Expand Up @@ -327,34 +253,6 @@
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
<configuration>
<!-- Enable if GPG 2.1+ is used -->
<!--<gpgArguments>
<arg>&#45;&#45;pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>-->
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>docker</id>
<build>
Expand Down Expand Up @@ -443,6 +341,13 @@
</profile>
</profiles>

<pluginRepositories>
<pluginRepository>
<id>smartbear-sweden-plugin-repository</id>
<url>https://www.soapui.org/repository/maven2/</url>
</pluginRepository>
</pluginRepositories>

<repositories>
<!-- Geotk is not deployed in Central repository. -->
<repository>
Expand All @@ -454,10 +359,6 @@
</repositories>

<distributionManagement>
<repository>
<id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<site>
<id>site</id>
<url>scm:git:[email protected]:opengeospatial/ets-cat30.git</url>
Expand Down
Loading

0 comments on commit 1ab5d27

Please sign in to comment.