#23 - Add plugin and adjust outdated and delete obsolete content in p…

…om.xml and update jenkinsfiles
opengeospatial · Jan 3, 2025 · f9a2fcb · f9a2fcb
1 parent e05d988
commit f9a2fcb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 59 deletions.
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 -Pintegration-tests,docker'
+        sh 'mvn clean install site -Pintegration-tests,docker -Dsoapui.test.fail.ignore=true'
       }
     }
     stage('Results') {

diff --git a/jenkinsfiles/release/Jenkinsfile b/jenkinsfiles/release/Jenkinsfile
@@ -1,34 +1,35 @@
 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-georss10.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 -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{
-        junit '**/target/surefire-reports/TEST-*.xml'
-        archive 'target/*'
+        archiveArtifacts artifacts: 'target/*', allowEmptyArchive: true
+        deleteDir()
       }
     }
   }

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -13,17 +14,17 @@
 
   <name>GeoRSS 1.0 Conformance Test Suite</name>
   <description>Describe purpose of test suite.</description>
-  <url>http://opengeospatial.github.io/ets-georss10/</url>
+  <url>https://opengeospatial.github.io/ets-georss10/</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-georss10.git</connection>
@@ -37,16 +38,14 @@
   </issueManagement>
   <developers>
     <developer>
-      <name>Alpha Beta</name>
-      <url>https://github.com/</url>
-      <timezone>UTC</timezone>
+      <name>Dirk Stenger</name>
+      <url>https://github.com/dstenger</url>
     </developer>
   </developers>
 
   <properties>
     <ets-code>georss10</ets-code>
     <spec-version>1.0</spec-version>
-    <docker.teamengine.version>5.4</docker.teamengine.version>
   </properties>
 
   <dependencies>
@@ -82,22 +81,13 @@
               <mainClass>org.opengis.cite.georss10.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-scm-publish-plugin</artifactId>
       </plugin>
     </plugins>
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -106,28 +96,6 @@
           <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>
                     <port>8081:8080</port>
@@ -186,10 +154,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-georss10.git</url>