opengeospatial · bpross-52n · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025 · Feb 19, 2025
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+.project
+.settings/
+target/
diff --git a/jenkinsfiles/build/Jenkinsfile b/jenkinsfiles/build/Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
   agent any
   tools {
-    maven 'mvn'
-    jdk 'JDK 8'
+    maven 'mvn396'
+    jdk 'temurin-jdk17'
   }
   stages {
     stage('Preparation') {
@@ -14,7 +14,7 @@ pipeline {
     stage('Build') {
       steps{
         sh 'mvn --version'
-        sh 'mvn clean install site'
+        sh 'mvn clean install site -Pintegration-tests,docker -Dsoapui.test.fail.ignore=true'
       }
     }
     stage('Results') {
@@ -23,4 +23,4 @@ pipeline {
       }
     }
   }
-}
+}
diff --git a/jenkinsfiles/release/Jenkinsfile b/jenkinsfiles/release/Jenkinsfile
@@ -1,34 +1,36 @@
 pipeline {
   agent any
   tools {
-    maven 'mvn'
-    jdk 'JDK 8'
+    maven 'mvn396'
+    jdk 'temurin-jdk17'
   }
   stages {
-    stage('Preparation') {
+    stage('Initialize') {
       steps{
-        deleteDir()
-        sh 'git clone [email protected]:opengeospatial/ets-sps20.git .'
+        sh '''
+          echo "PATH = ${PATH}"
+          echo "M2_HOME = ${M2_HOME}"
+        '''
+        sh 'mvn --version'
       }
     }
     stage('Release') {
       steps{
-        sh 'mvn --version'
-        sh 'mvn -Dresume=false -DdryRun=true release:prepare -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
-        sh 'mvn -Dresume=false release:prepare release:perform -Psign-artifacts-with-ogc -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
+        sh 'mvn -Dresume=false -DdryRun=true release:prepare -Psign-artifacts-with-ogc,integration-tests,docker -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
+        sh 'mvn -Dresume=false release:prepare release:perform -Psign-artifacts-with-ogc,integration-tests,docker -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion}'
       }
     }
     stage('Publication of site') {
       steps{
-        sh 'mvn --version'
         sh 'git checkout ${releaseVersion}'
         sh 'mvn clean install site site:stage scm-publish:publish-scm'
       }
     }
     stage('Results') {
       steps{
-        archive 'target/*'
+        archiveArtifacts artifacts: 'target/*', allowEmptyArchive: true
+        deleteDir()
       }
     }
   }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+    <version>15-SNAPSHOT</version>
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ets-sps20</artifactId>
-  <groupId>org.opengis.cite</groupId>
   <version>1.12-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -14,13 +21,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>
     <url>https://github.com/opengeospatial/ets-sps20</url>
@@ -37,133 +44,89 @@
       <name>Rockygis</name>
       <url>https://github.com/rockygis</url>
     </developer>
+    <developer>
+      <name>Dirk Stenger</name>
+      <url>https://github.com/dstenger</url>
+    </developer>
   </developers>
 
   <properties>
     <ets-code>sps</ets-code>
     <spec-version>2.0.0</spec-version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <teamengine.version>4.0.5</teamengine.version>
   </properties>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.7</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>license</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-jar</id>
-            <phase>never</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>src/assembly/ctl.xml</descriptor>
+            <descriptor>src/assembly/ctl-scripts.xml</descriptor>
           </descriptors>
         </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
-        <configuration>
-          <relativizeDecorationLinks>false</relativizeDecorationLinks>
-          <skipDeploy>true</skipDeploy>
-        </configuration>
-        <executions>
-          <execution>
-            <id>site-package</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>site</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.doxia</groupId>
-            <artifactId>doxia-module-markdown</artifactId>
-            <version>1.6</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <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-scm-publish-plugin</artifactId>
-        <version>1.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>
+                <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>
+      </plugins>
+    </pluginManagement>
   </build>
 
   <profiles>
     <profile>
-      <id>release</id>
+      <id>docker</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <groupId>io.fabric8</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>build</id>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>push</id>
+                <goals>
+                  <goal>push</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
                 <goals>
-                  <goal>sign</goal>
+                  <goal>copy</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>
@@ -173,10 +136,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-sps20.git</url>

diff --git a/src/assembly/ctl.xml → src/assembly/ctl-scripts.xml b/src/assembly/ctl.xml → src/assembly/ctl-scripts.xml
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
@@ -0,0 +1,27 @@
+FROM tomcat:10.1-jre17
+
+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
+
+# add TEAM Engine common libs
+ADD maven/dependency/teamengine-web-*-common-libs.zip /root/
+RUN cd /root/ && unzip -q teamengine-web-*-common-libs.zip -d /usr/local/tomcat/lib
+
+# add TEAM Engine console
+ADD maven/dependency/teamengine-console-*-base.zip /root/
+RUN cd /root/ && unzip -q teamengine-console-*-base.zip -d /root/te_base
+
+# set TE_BASE
+ENV JAVA_OPTS="-Xms1024m -Xmx2048m -DTE_BASE=/root/te_base"
+
+# add ETS for SensorML 1.0
+ADD maven/ets-sps20-*-ctl.zip /root/
+RUN cd /root/ && unzip -q ets-sps20-*-ctl.zip -d /root/te_base/scripts
+
+RUN rm -R /root/te_base/scripts/note
+
+# run tomcat
+CMD ["catalina.sh", "run"]
diff --git a/src/site/site.xml b/src/site/site.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="${project.name}" 
-  xmlns="http://maven.apache.org/DECORATION/1.4.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd">
+<project name="${project.name}"
+         xmlns="http://maven.apache.org/DECORATION/1.7.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd">
 
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.1</version>
+    <version>2.0.1</version>
   </skin>
   <custom>
     <fluidoSkin>
@@ -18,7 +18,7 @@
   <bannerLeft>
     <name>${project.name}</name>
     <src>./img/ogc-logo.png</src>
-    <href>http://cite.opengeospatial.org/</href>
+    <href>https://cite.opengeospatial.org/</href>
   </bannerLeft>
   <bannerRight>
     <name>${project.name}</name>
@@ -29,10 +29,10 @@
       <item name="Issues" href="https://github.com/opengeospatial/${project.artifactId}/issues"/>
     </links>
     <menu name="Documentation">
-      <item href="index.html" name="Overview" />
-      <item href="relnotes.html" name="Release Notes" />
+      <item href="index.html" name="Overview"/>
+      <item href="relnotes.html" name="Release Notes"/>
     </menu>
-    <menu ref="reports" />
+    <menu ref="reports"/>
 
   </body>
 </project>