Skip to content

Commit

Permalink
Merge pull request #31 from PlaytikaOSS/feature/fix_maven_structure_a…
Browse files Browse the repository at this point in the history 
…nd_plugins_versions

Fix maven pom files and plugin versions
  • Loading branch information
@Fameing
Fameing authored Nov 3, 2023
2 parents 1b93287 + 067615e commit 607f7d2
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 139 deletions.
24 changes: 0 additions & 24 deletions aerospike-batch-updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@
<packaging>jar</packaging>
<name>Batch updates on Aerospike</name>

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

<dependencies>

<dependency>
<groupId>com.aerospike</groupId>
<artifactId>aerospike-client</artifactId>
Expand Down Expand Up @@ -87,24 +82,5 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
2 changes: 0 additions & 2 deletions aerospike-container/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,5 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>

</dependencies>

</project>
6 changes: 0 additions & 6 deletions aerospike-reactor-batch-updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
<packaging>jar</packaging>
<name>Reactor batch updates on Aerospike</name>

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -123,7 +119,5 @@
<artifactId>blockhound</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

</project>
22 changes: 0 additions & 22 deletions batch-updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
<packaging>jar</packaging>
<name>Batch updates on NoSql DBs</name>

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -70,22 +66,4 @@
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
113 changes: 51 additions & 62 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,34 @@
<aerospike-reactor-client.version>6.1.2</aerospike-reactor-client.version>
<slf4j.version>1.7.25</slf4j.version>

<reactor-core.version>3.2.12.RELEASE</reactor-core.version>

<!-- Tests -->
<testcontainers.version>1.19.1</testcontainers.version>
<junit.version>4.12</junit.version>
<assertj.version>3.9.0</assertj.version>
<blockhound.version>1.0.8.RELEASE</blockhound.version>

<slf4j-log4j12.version>1.8.0-beta0</slf4j-log4j12.version>
<hamcrest.version>1.3</hamcrest.version>
<log4j.version>2.11.1</log4j.version>
<awaitility.version>3.1.6</awaitility.version>

<!-- Plugins -->
<jacoco-plugin.version>0.7.7.201606060606</jacoco-plugin.version>
<coveralls-plugin.version>4.1.0</coveralls-plugin.version>

<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<versions-maven-plugin.version>2.3</versions-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
<maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.1.0</maven.source.plugin.version>

<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven.javadoc.plugin.version>3.6.0</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>

<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<gitflow-incremental-builder.version>4.5.1</gitflow-incremental-builder.version>

<!-- GPG -->
<gpg.keyname>3EEF24C7</gpg.keyname>
<gpg.defaultKeyring>false</gpg.defaultKeyring>
<gpg.useagent>true</gpg.useagent>
<gpg.lockMode>never</gpg.lockMode>

<reactor-core.version>3.2.12.RELEASE</reactor-core.version>
</properties>


Expand Down Expand Up @@ -212,13 +207,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
Expand All @@ -241,8 +229,16 @@
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
Expand All @@ -265,17 +261,11 @@
</configuration>
</plugin>

<!-- Produce code coverage -->
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-plugin.version}</version>
</plugin>

<!-- Attach sources to release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -286,21 +276,11 @@
</executions>
</plugin>

<!-- Submits coverage reports to Coveralls -->
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${coveralls-plugin.version}</version>
</plugin>

<!-- Attach Javadoc to release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<source>17</source>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -309,45 +289,57 @@
</goals>
</execution>
</executions>
<configuration>
<source>17</source>
<doclint>none</doclint>
<failOnError>false</failOnError>
</configuration>
</plugin>

<plugin>
<groupId>io.github.gitflow-incremental-builder</groupId>
<artifactId>gitflow-incremental-builder</artifactId>
<version>${gitflow-incremental-builder.version}</version>
<extensions>true</extensions>
<configuration>
<disableIfBranchMatches>develop</disableIfBranchMatches>
<fetchReferenceBranch>true</fetchReferenceBranch>
<referenceBranch>refs/remotes/origin/develop</referenceBranch>
<buildUpstream>always</buildUpstream>
<skipTestsForUpstreamModules>true</skipTestsForUpstreamModules>
<buildUpstreamMode>impacted</buildUpstreamMode>
<skipIfPathMatches>\.github[/\\].*|\.mvn[/\\].*|mvnw.*</skipIfPathMatches>
<!-- Ignores Readme changes in parent or any submodule-->
<excludePathsMatching>(.*[/\\])?README.adoc</excludePathsMatching>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>

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

<!-- Attach Javadoc to release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>

<!-- Attach sources to release -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>

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

<plugin>
<groupId>io.github.gitflow-incremental-builder</groupId>
<artifactId>gitflow-incremental-builder</artifactId>
<version>${gitflow-incremental-builder.version}</version>
<extensions>true</extensions>
<configuration>
<disableIfBranchMatches>develop</disableIfBranchMatches>
<fetchReferenceBranch>true</fetchReferenceBranch>
<referenceBranch>refs/remotes/origin/develop</referenceBranch>
<buildUpstream>always</buildUpstream>
<skipTestsForUpstreamModules>true</skipTestsForUpstreamModules>
<buildUpstreamMode>impacted</buildUpstreamMode>
<skipIfPathMatches>\.github[/\\].*|\.mvn[/\\].*|mvnw.*</skipIfPathMatches>
<!-- Ignores Readme changes in parent or any submodule-->
<excludePathsMatching>(.*[/\\])?README.adoc</excludePathsMatching>
</configuration>
</plugin>
</plugins>
</build>
Expand Down Expand Up @@ -386,7 +378,4 @@
</build>
</profile>
</profiles>



</project>
23 changes: 0 additions & 23 deletions reactor-batch-updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
<packaging>jar</packaging>
<name>Reactor batch updates on NoSql DBs</name>

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -80,24 +76,5 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 607f7d2

Please sign in to comment.