Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #43 #46

Merged
merged 16 commits into from
Jan 27, 2025
Merged

Closes #43 #46

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5ce1400
Make workable with JDK 17
csringhofer Feb 27, 2024
c60aa89
Fix build errors
bpross-52n Dec 11, 2024
079fe88
Formatting and javadoc
bpross-52n Dec 11, 2024
4c534ec
CHange system property fro user.dir to user.home
bpross-52n Dec 11, 2024
e891465
Organize imports
bpross-52n Dec 11, 2024
d83d4dc
Adjust assembly files
bpross-52n Dec 11, 2024
b3d75ce
Adjust pom.xml
bpross-52n Dec 11, 2024
e3d3c85
Remove final modifier
bpross-52n Dec 11, 2024
c99f5d5
Adjust path for execution on WIndows
bpross-52n Dec 11, 2024
aa609c5
Re-introduce ReusableEntityFilter
bpross-52n Dec 12, 2024
ef5aa3c
Formatting
bpross-52n Dec 12, 2024
48e58c1
Move dependency versions to ets-common
bpross-52n Dec 12, 2024
75ade3f
Adjust filtering of resources
bpross-52n Dec 16, 2024
72ae273
Remove inherited dependency
bpross-52n Dec 17, 2024
bdd92f7
#43 - Add plugin and adjust outdated and delete obsolete content in p…
dstenger Jan 23, 2025
354f4d5
#43 - Set maven-fluido-skin to version 2.0.1
dstenger Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 37 additions & 166 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
<parent>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-common</artifactId>
<version>9</version>
<version>14-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.opengis.cite</groupId>
<artifactId>ets-geotiff11</artifactId>
<version>1.2-SNAPSHOT</version>
<packaging>jar</packaging>
Expand Down Expand Up @@ -47,109 +45,80 @@
<properties>
<ets-code>geotiff11</ets-code>
<spec-version>1.1</spec-version>
<docker.teamengine.version>5.4.1</docker.teamengine.version>
<jhove.version>1.16.6</jhove.version>
<docker.teamengine.version>6.0.0-RC2</docker.teamengine.version>
</properties>

<dependencies>
<dependency>
<groupId>org.opengis.cite.teamengine</groupId>
<artifactId>teamengine-spi</artifactId>
<!-- jersey 3 and jakarta are get transitivily from teamengine. Adding the same dependencies to the pom resulted in class loader issues. -->
</dependency>
<dependency>
<groupId>org.opengis.cite</groupId>
<artifactId>schema-utils</artifactId>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.5</version>
</dependency>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-modules</artifactId>
<version>${jhove.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
</dependency>
<dependency>
<groupId>org.opengis.cite.saxon</groupId>
<artifactId>saxon9</artifactId>
<version>9.0.0.8</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.48</version>
</dependency>
<dependency>
<groupId>org.openpreservation.jhove</groupId>
<artifactId>jhove-core</artifactId>
<version>${jhove.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
<show>package</show>
<links>
<link>http://testng.org/javadocs/</link>
</links>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand All @@ -173,66 +142,12 @@
</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>
<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-site-plugin</artifactId>
<version>3.7.1</version>
<executions>
<execution>
<id>site-package</id>
<phase>prepare-package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<version>1.5.7.1</version>
</dependency>
</dependencies>
<configuration>
<relativizeDecorationLinks>false</relativizeDecorationLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
</plugin>
<plugin>
<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>
<version>0.27.2</version>
<configuration>
<images>
<image>
Expand Down Expand Up @@ -272,34 +187,6 @@
</image>
</images>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -317,6 +204,17 @@
</plugin>
Copy link
Contributor

@dstenger dstenger Dec 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maven-resources-plugin:
Can you please check if this can be simplified (e.g. moved to resources element)? If this is not possible, the version shall be moved to ets-common.

</plugins>
</pluginManagement>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/javadoc</directory>
<filtering>true</filtering>
<targetPath>doc/${ets-code}/${project.version}</targetPath>
</resource>
</resources>
</build>

<profiles>
Expand All @@ -326,7 +224,6 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.0</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -374,32 +271,6 @@
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</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>
</profiles>

<distributionManagement>
Expand Down
3 changes: 0 additions & 3 deletions src/assembly/aio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<exclude>com.sun.jersey:jersey-server</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
19 changes: 4 additions & 15 deletions src/assembly/deps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,13 @@
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<includes>
<include>com.sun.jersey:jersey-client</include>
<include>org.opengis.cite:schema-utils</include>
</includes>
<outputDirectory>/</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
<excludes>
<exclude>org.opengis.cite.teamengine:teamengine-spi</exclude>
<exclude>com.sun.jersey:jersey-client</exclude>
<exclude>org.opengis.cite:schema-utils</exclude>
<exclude>org.testng:testng</exclude>
<exclude>com.beust:jcommander</exclude>
<exclude>javax.ws.rs:jsr311-api</exclude>
<exclude>*:jersey-client</exclude>
<exclude>*:jersey-server</exclude>
<exclude>*:jersey-common</exclude>
<exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<unpack>false</unpack>
Expand Down
4 changes: 3 additions & 1 deletion src/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
FROM tomcat:7.0-jre8
FROM tomcat:10.1-jre17

RUN apt update && apt install -y unzip

# add TEAM engine webapp
ADD maven/dependency/teamengine-web-*.war /root/
Expand Down
Loading