-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#78 - Include updated ets-common and refactorings
- Loading branch information
Showing
75 changed files
with
4,519 additions
and
5,250 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> | ||
|
||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
|
@@ -12,7 +13,7 @@ | |
|
||
<name>GML 3.2 (ISO 19136:2007) Conformance Test Suite</name> | ||
<description> | ||
Checks GML application schemas or data sets for conformance to ISO 19136:2007. | ||
Checks GML application schemas or data sets for conformance to ISO 19136:2007. | ||
</description> | ||
<licenses> | ||
<license> | ||
|
@@ -23,7 +24,7 @@ | |
|
||
<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-gml32.git</connection> | ||
|
@@ -41,6 +42,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> | ||
|
@@ -57,13 +63,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.teamengine</groupId> | ||
|
@@ -74,10 +73,10 @@ | |
<groupId>org.opengis.cite</groupId> | ||
<artifactId>schema-utils</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> | ||
|
@@ -116,112 +115,43 @@ | |
<mainClass>org.opengis.cite.iso19136.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> | ||
<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> | ||
<artifactId>maven-site-plugin</artifactId> | ||
</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> | ||
<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-gml32-soapui-project.xml</projectFile> | ||
<outputFolder>${project.build.directory}/soapui</outputFolder> | ||
<junitReport>true</junitReport> | ||
<testFailIgnore>${soapui.test.fail.ignore}</testFailIgnore> | ||
<projectProperties> | ||
<value>teamengine.endpoint=${soapui.teamengine.endpoint}</value> | ||
<value>teamengine.user=${soapui.teamengine.user}</value> | ||
<value>teamengine.password=${soapui.teamengine.password}</value> | ||
<value>iut=${soapui.iut}</value> | ||
<value>tests.passed=${soapui.tests.passed}</value> | ||
<value>tests.skipped=${soapui.tests.skipped}</value> | ||
<value>tests.failed=${soapui.tests.failed}</value> | ||
</projectProperties> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
|
||
<pluginManagement> | ||
<plugins> | ||
<plugin> | ||
<groupId>com.smartbear.soapui</groupId> | ||
<artifactId>soapui-maven-plugin</artifactId> | ||
<configuration> | ||
<projectFile>src/test/resources/soapui/ets-gml32-soapui-project.xml</projectFile> | ||
<settingsFile>src/test/resources/soapui/ets-gml32-soapui-settings.xml</settingsFile> | ||
<testFailIgnore>${soapui.test.fail.ignore}</testFailIgnore> | ||
<projectProperties> | ||
<value>teamengine.endpoint=${soapui.teamengine.endpoint}</value> | ||
<value>teamengine.user=${soapui.teamengine.user}</value> | ||
<value>teamengine.password=${soapui.teamengine.password}</value> | ||
<value>iut=${soapui.iut}</value> | ||
<value>tests.passed=${soapui.tests.passed}</value> | ||
<value>tests.skipped=${soapui.tests.skipped}</value> | ||
<value>tests.failed=${soapui.tests.failed}</value> | ||
</projectProperties> | ||
</configuration> | ||
</plugin> | ||
<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> | ||
|
@@ -240,7 +170,6 @@ | |
</plugin> | ||
<plugin> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<version>3.6.1</version> | ||
<configuration> | ||
<artifactItems> | ||
<artifactItem> | ||
|
@@ -268,6 +197,7 @@ | |
</plugin> | ||
</plugins> | ||
</pluginManagement> | ||
|
||
<testResources> | ||
<testResource> | ||
<directory>${basedir}/src/test/resources</directory> | ||
|
@@ -328,33 +258,6 @@ | |
</plugins> | ||
</build> | ||
</profile> | ||
<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> | ||
<gpgArguments> | ||
<arg>--pinentry-mode</arg> | ||
<arg>loopback</arg> | ||
</gpgArguments> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</profile> | ||
<profile> | ||
<id>docker</id> | ||
<build> | ||
|
@@ -392,16 +295,12 @@ | |
</profile> | ||
</profiles> | ||
|
||
<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-gml32.git</url> | ||
</site> | ||
</distributionManagement> | ||
<pluginRepositories> | ||
<pluginRepository> | ||
<id>smartbear-sweden-plugin-repository</id> | ||
<url>https://www.soapui.org/repository/maven2/</url> | ||
</pluginRepository> | ||
</pluginRepositories> | ||
|
||
<repositories> | ||
<!-- Geotk milestones are not deployed in Central repository. --> | ||
|
@@ -412,4 +311,11 @@ | |
<layout>default</layout> | ||
</repository> | ||
</repositories> | ||
|
||
<distributionManagement> | ||
<site> | ||
<id>site</id> | ||
<url>scm:git:[email protected]:opengeospatial/ets-gml32.git</url> | ||
</site> | ||
</distributionManagement> | ||
</project> |
Oops, something went wrong.