Skip to content

Commit

Permalink
#43 - Add plugin and adjust outdated and delete obsolete content in p…
Browse files Browse the repository at this point in the history 
…om.xml and update jenkinsfiles
  • Loading branch information
@dstenger
dstenger committed Jan 23, 2025
1 parent 72ae273 commit bdd92f7
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 119 deletions.
6 changes: 3 additions & 3 deletions jenkinsfiles/build/Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pipeline {
agent any
tools {
maven 'mvn'
jdk 'JDK 8'
maven 'mvn396'
jdk 'temurin-jdk17'
}
stages {
stage('Preparation') {
Expand All @@ -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') {
Expand Down
19 changes: 10 additions & 9 deletions jenkinsfiles/release/Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -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-geotiff11.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()
}
}
}
Expand Down
177 changes: 70 additions & 107 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
<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>14-SNAPSHOT</version>
<version>14</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ets-geotiff11</artifactId>
<version>1.2-SNAPSHOT</version>
<packaging>jar</packaging>

<name>GeoTIFF 1.1 Conformance Test Suite</name>
<description>Describe purpose of test suite.</description>
<url>http://opengeospatial.github.io/ets-geotiff11/</url>
<url>https://opengeospatial.github.io/ets-geotiff11/</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-geotiff11.git</connection>
Expand All @@ -40,12 +42,15 @@
<url>https://github.com/djutras2/</url>
<timezone>UTC-4</timezone>
</developer>
<developer>
<name>Dirk Stenger</name>
<url>https://github.com/dstenger</url>
</developer>
</developers>

<properties>
<ets-code>geotiff11</ets-code>
<spec-version>1.1</spec-version>
<docker.teamengine.version>6.0.0-RC2</docker.teamengine.version>
</properties>

<dependencies>
Expand All @@ -58,7 +63,6 @@
<groupId>org.opengis.cite</groupId>
<artifactId>schema-utils</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -78,40 +82,41 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-modules</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
<dependency>
<groupId>org.opengis.cite.saxon</groupId>
<artifactId>saxon9</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-core</artifactId>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-modules</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
<dependency>
<groupId>org.opengis.cite.saxon</groupId>
<artifactId>saxon9</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-core</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -122,22 +127,13 @@
<mainClass>org.opengis.cite.geotiff11.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>
Expand All @@ -146,28 +142,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>
Expand All @@ -185,29 +159,30 @@
</plugin>
</plugins>
</pluginManagement>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.exe</exclude>
<exclude>**/*.dll</exclude>
<exclude>**/*.tif</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/*.zip</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.exe</include>
<include>**/*.dll</include>
<include>**/*.tif</include>
<include>**/*.csv</include>
<include>**/*.zip</include>
</includes>
</resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.exe</exclude>
<exclude>**/*.dll</exclude>
<exclude>**/*.tif</exclude>
<exclude>**/*.csv</exclude>
<exclude>**/*.zip</exclude>
</excludes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.exe</include>
<include>**/*.dll</include>
<include>**/*.tif</include>
<include>**/*.csv</include>
<include>**/*.zip</include>
</includes>
</resource>
<resource>
<directory>src/main/javadoc</directory>
<filtering>true</filtering>
Expand All @@ -223,14 +198,6 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -273,10 +240,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-geotiff11.git</url>
Expand Down

0 comments on commit bdd92f7

Please sign in to comment.