Skip to content

Commit

Permalink
#62 - Include updated ets-common and refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
@dstenger
dstenger committed Oct 18, 2024
1 parent db21ce4 commit b7ddce2
Show file tree
Hide file tree
Showing 11 changed files with 1,467 additions and 1,546 deletions.
247 changes: 70 additions & 177 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/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">
<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
Expand All @@ -17,13 +18,13 @@
<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-gpkg12-nsg.git</connection>
Expand Down Expand Up @@ -122,10 +123,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>
</dependencies>
Expand All @@ -140,79 +141,74 @@
<mainClass>org.opengis.cite.gpkg12.nsg.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>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
<releaseProfiles>release</releaseProfiles>
</configuration>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-scm-publish-plugin</artifactId>
<version>3.2.1</version>
<configuration>
<scmBranch>gh-pages</scmBranch>
</configuration>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<build>
<tags>
<tag>${project.version}-teamengine-${docker.teamengine.version}</tag>
</tags>
</build>
<run>
<ports>
<port>8081:8080</port>
</ports>
<wait>
<http>
<url>http://localhost:8081/teamengine</url>
</http>
<time>120000</time>
</wait>
</run>
</image>
</images>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<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>
</build>

<profiles>
Expand All @@ -223,127 +219,28 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.43.4</version>
<configuration>
<images>
<image>
<name>opengeospatial/${project.artifactId}</name>
<build>
<dockerFileDir>${project.basedir}/src/main/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>
<port>8081:8080</port>
</ports>
<wait>
<http>
<url>http://localhost:8081/teamengine</url>
</http>
<time>120000</time>
</wait>
</run>
</image>
</images>
</configuration>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>build</goal>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
<goal>remove</goal>
</goals>
</execution>
<execution>
<id>build</id>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>push</id>
<goals>
<goal>copy-dependencies</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-web</artifactId>
<version>${docker.teamengine.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-web</artifactId>
<version>${docker.teamengine.version}</version>
<classifier>common-libs</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-console</artifactId>
<version>${docker.teamengine.version}</version>
<classifier>base</classifier>
<type>zip</type>
</dependency>
</dependencies>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
<goal>copy</goal>
</goals>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -353,10 +250,6 @@
</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-gpkg12-nsg.git</url>
Expand Down
0 src/main/docker/Dockerfile → src/docker/Dockerfile
View file
File renamed without changes.
Loading

0 comments on commit b7ddce2

Please sign in to comment.