Skip to content

Commit

Permalink
[QA] pom cleanup and organization (#388)
Browse files Browse the repository at this point in the history
  • Loading branch information
@afabiani
afabiani authored Nov 14, 2024
1 parent 585b5c3 commit c343a62
Show file tree
Hide file tree
Showing 11 changed files with 168 additions and 237 deletions.
192 changes: 165 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,118 @@
<tag>HEAD</tag>
</scm>

<properties>
<main-prefix>geostore</main-prefix>
<cxf-version>3.5.7</cxf-version>
<activemq-version>5.3.0.4-fuse</activemq-version>
<jersey-version>2.5.1</jersey-version>
<!--
spring-security-core 3.0.4 requires spring-core 3.x, otherwise we'd normally use 2.5.6, which
is what the rest of the app uses
-->
<spring-version>5.3.18</spring-version>
<!-- 2.5.6.SEC01 is the version used by smix-->
<!-- 2.5.5 is the version used by memberService-->
<spring-security-version>5.7.13</spring-security-version>
<spring-security-oauth2-version>2.5.2.RELEASE</spring-security-oauth2-version>
<camel-version>1.6.1.2-fuse</camel-version>
<velocity-version>1.6.2</velocity-version>
<javax-mail-version>1.4</javax-mail-version>
<javax-annotation-version>1.0</javax-annotation-version>
<xalan-version>2.7.0</xalan-version>
<xercesImpl-version>2.8.1</xercesImpl-version>
<xml-apis-version>1.3.03</xml-apis-version>
<jaxws-version>2.3.1</jaxws-version>
<commons-logging-version>1.1.1</commons-logging-version>
<commons-lang-version>2.3</commons-lang-version>
<commons-collections-version>3.2.2</commons-collections-version>
<commons-beanutils-version>1.9.4</commons-beanutils-version>
<commons-dbcp-version>1.2.2</commons-dbcp-version>
<commons-codec-version>1.4</commons-codec-version>
<geronimo-specs-version>1.1</geronimo-specs-version>
<dozer-version>4.0</dozer-version>
<jaxb-api-version>2.1</jaxb-api-version>
<jaxb-impl-version>2.1.2</jaxb-impl-version>
<log4j-version>2.19.0</log4j-version>
<maven-assembly-plugin-version>2.2-beta-5</maven-assembly-plugin-version>
<xbean-version>3.1.0.2-fuse</xbean-version>
<spring-support>2.0.8</spring-support>
<spring-ws-version>1.0.1</spring-ws-version>
<aspectj-version>1.5.4</aspectj-version>
<ubl-version>2.0</ubl-version>
<jetty-version>6.1H.22</jetty-version>
<jettison-version>1.5.4</jettison-version>
<persistence-version>1.0</persistence-version>
<hibernate-version>5.4.33.Final</hibernate-version>
<hibernate-generic-dao-version>geosolutions-1.3.0</hibernate-generic-dao-version>
<asm-version>2.2.3</asm-version>
<cglib-version>2.1_3</cglib-version>
<guava-version>32.0.0-android</guava-version>
<mockito-version>4.0.0</mockito-version>
<javassist-version>3.8.0.GA</javassist-version>
<geoapi-version>2.3-M1</geoapi-version>
<gt-version>2.7-RC2</gt-version>
<jackson-version>2.16.1</jackson-version>
<gson.version>2.9.0</gson.version>
<quartz.version>1.5.2</quartz.version>
<jdom.version>1.0</jdom.version>
<commons-io.version>2.14.0</commons-io.version>
<httpclient.version>4.5.13</httpclient.version>
<acegi-security-tiger.version>1.0.7</acegi-security-tiger.version>
<hibernate-jpa-2.1-api.version>1.0.2.Final</hibernate-jpa-2.1-api.version>
<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
<junit.version>4.13.2</junit.version>
<dao-hibernate.version>geosolutions-1.3.0</dao-hibernate.version>
<jsr-275.version>1.0-beta-2</jsr-275.version>
<jt-utils.version>1.1.1</jt-utils.version>
<jai_imageio.version>1.1</jai_imageio.version>
<jai_codec.version>1.1.3</jai_codec.version>
<hibernate-spatial-postgis.version>1.1.1</hibernate-spatial-postgis.version>
<postgis-jdbc.version>1.3.3</postgis-jdbc.version>
<postgresql.version>42.3.9</postgresql.version>
<jts.version>1.10</jts.version>
<h2.version>1.3.175</h2.version>
<picocli.version>4.6.1</picocli.version>
<ojdbc6.version>11.2.0</ojdbc6.version>
<spring-security-oauth2.version>2.0.17.RELEASE</spring-security-oauth2.version>
<jasypt.version>1.9.3</jasypt.version>
<keycloak-spring-security-adapter.version>18.0.0</keycloak-spring-security-adapter.version>
<spring-security-jwt.version>1.0.11.RELEASE</spring-security-jwt.version>
<java-jwt.version>3.18.3</java-jwt.version>
<wiremock-standalone.version>2.1.12</wiremock-standalone.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
<jersey-apache-client.version>1.12</jersey-apache-client.version>
<freemarker.version>2.3.20</freemarker.version>
<apacheds-all.version>1.5.5</apacheds-all.version>
<shared-ldap.version>0.9.16</shared-ldap.version>
<jetty.version>6.1.23</jetty.version>
<jstl.version>1.2</jstl.version>
<json-lib.version>2.4.2-geoserver</json-lib.version>
<maven-pmd-plugin.version>3.11.0</maven-pmd-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<qa>true</qa>
<lint>deprecation</lint>
<spotbugs-maven-pligin>3.1.12.2</spotbugs-maven-pligin>
<pmd.version>6.42.0</pmd.version>
<errorProneFlags />
<errorProne.version>2.18.0</errorProne.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-compiler-plugin.source>8</maven-compiler-plugin.source>
<maven-compiler-plugin.target>8</maven-compiler-plugin.target>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-release-plugin.version>2.5.2</maven-release-plugin.version>
<maven-jar-plugin.version>2.4</maven-jar-plugin.version>
<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<dependency-check-maven.version>9.0.9</dependency-check-maven.version>
<fmt-maven-plugin.version>2.9.1</fmt-maven-plugin.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<wagon-ftp.version>2.10</wagon-ftp.version>
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
<coveralls-maven-plugin.version>4.1.0</coveralls-maven-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
</properties>

<ciManagement>
<system>jenkins</system>
<url>http://build.geo-solutions.it/jenkins/view/GeoStore/</url>
Expand Down Expand Up @@ -95,13 +207,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<encoding>utf8</encoding>
<source>8</source>
<target>8</target>
<encoding>${project.build.sourceEncoding}</encoding>
<source>${maven-compiler-plugin.source}</source>
<target>${maven-compiler-plugin.target}</target>
<debug>true</debug>
<encoding>UTF-8</encoding>
<!--
On the win32 build box the compiler oom's due to the compiler accumulating
too many classes in the permanent generation, similar to GEOT-2462
Expand All @@ -119,7 +230,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>${maven-source-plugin.version}</version>
<configuration>
<attach>true</attach>
</configuration>
Expand All @@ -139,7 +250,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>${maven-release-plugin.version}</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
Expand All @@ -148,7 +259,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -159,27 +270,59 @@
</plugin>

<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

<!-- Maven Surefire Plugin -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<useModulePath>false</useModulePath>
<argLine>-Dfile.encoding=UTF-8 -noverify</argLine>
</configuration>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-maven-plugin.version}</version>
<!-- configuration>
<repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
<jacocoReportPath>${project.reporting.outputDirectory}/jacoco/unit/jacoco.xml</jacocoReportPath>
</configuration -->
</plugin>

<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>9.0.9</version>
<version>${dependency-check-maven.version}</version>
<configuration>
<skip>true</skip>
<!-- <nvdApiKey>******-****-****-****-*********</nvdApiKey> -->
Expand All @@ -196,7 +339,7 @@
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.9.1</version>
<version>${fmt-maven-plugin.version}</version>
<configuration>
<verbose>false</verbose>
<filesNamePattern>.*\.java</filesNamePattern>
Expand All @@ -215,7 +358,7 @@
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>0.3.1</version>
<version>${directory-maven-plugin.version}</version>
<executions>
<execution>
<id>directories</id>
Expand All @@ -235,7 +378,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ftp</artifactId>
<version>2.10</version>
<version>${wagon-ftp.version}</version>
</extension>
</extensions>

Expand All @@ -260,9 +403,4 @@
<modules>
<module>src</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

</project>
5 changes: 2 additions & 3 deletions src/core/persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<!-- if you want to create a new profile for support another DB create a profile including -->
<!-- JDBC dependency and right esclusion/inclusion rule for load the right override file -->
<!-- if you want to create a new profile for support, another DB create a profile including -->
<!-- JDBC dependency and right exclusion/inclusion rule for a load the right override file -->
<!-- Profile for supporting Postgres -->
<profiles>
<profile>
Expand Down
1 change: 0 additions & 1 deletion src/core/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
<groupId>it.geosolutions.geostore</groupId>
<artifactId>geostore-model</artifactId>
</dependency>

</dependencies>

</project>
1 change: 0 additions & 1 deletion src/core/services-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
3 changes: 1 addition & 2 deletions src/core/services-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -181,7 +180,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<version>${cobertura-maven-plugin.version}</version>
<configuration>
<instrumentation>
</instrumentation>
Expand Down
5 changes: 0 additions & 5 deletions src/modules/rest/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
</plugin>
</plugins>
</build>

Expand Down
36 changes: 0 additions & 36 deletions src/modules/rest/extjs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,40 +103,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

<!-- Attach sources ============================================ -->
<!--
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
</plugin>
</plugins>
</build>


</project>
Loading

0 comments on commit c343a62

Please sign in to comment.