Tune maven-publish/cleanup

p3t · Nov 13, 2024 · 073fa1e · 073fa1e
1 parent 1296db7
commit 073fa1e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 38 deletions.
diff --git a/cursorpaging-examples/webapp-with-maven/pom.xml b/cursorpaging-examples/webapp-with-maven/pom.xml
@@ -5,22 +5,22 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.5</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>io.vigier</groupId>
   <artifactId>cursorpaging-example-webapp-with-maven</artifactId>
   <version>0-SNAPSHOT</version>
 
-  <name>cursorpaging :: example :: webapp-maven</name>
+  <name>Spring-CursorPaging :: Examples :: WebApp</name>
   <description>An maven build setup, using a released version of the cursorpaging libraries.</description>
 
   <properties>
     <java.version>17</java.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <lombok.version>1.18.32</lombok.version>
-    <cursorpage.version>0.9.3</cursorpage.version>
+    <cursorpage.version>0-SNAPSHOT</cursorpage.version>
     <testcontainers.version>1.19.8</testcontainers.version>
   </properties>
 
@@ -39,7 +39,7 @@
         </repository>
       </repositories>
       <properties>
-        <cursorpage.version>0.8.0-RC1</cursorpage.version>
+        <cursorpage.version>0.9.9-RC2</cursorpage.version>
       </properties>
     </profile>
   </profiles>
@@ -77,7 +77,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
@@ -99,6 +98,14 @@
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
       <version>2.5.0</version>
     </dependency>
+
+    <!-- Testing -->
+
+    <dependency>
+      <groupId>org.springframework.retry</groupId>
+      <artifactId>spring-retry</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
@@ -109,6 +116,11 @@
       <artifactId>spring-boot-testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <!-- Dependency overwrite from: Testcontainer -->
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>postgresql</artifactId>
@@ -123,13 +135,12 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- If you are using Spring Boot 3.1.0+ then you don't need to configure testcontainers-bom -->
+      <!-- (Overwrite) Dependency from testcontainers: https://osv.dev/vulnerability/GHSA-4g9r-vxhx-9pgx -->
       <dependency>
-        <groupId>org.testcontainers</groupId>
-        <artifactId>testcontainers-bom</artifactId>
-        <version>${testcontainers.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>1.27.1</version>
+        <scope>test</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -139,7 +150,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
         <configuration>
           <annotationProcessorPaths>
             <path>

diff --git a/cursorpaging-jpa-api/pom.xml b/cursorpaging-jpa-api/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>cursorpaging-jpa-api</artifactId>
   <version>0-SNAPSHOT</version>
 
-  <name>Spring-CursorPaging::JPA::API</name>
+  <name>Spring-CursorPaging :: JPA :: API</name>
   <description>Cursor paging support for Spring Data, Serialize/Deserializer for API layer</description>
   <url>https://github.com/p3t/spring-cursorpaging/</url>
   <inceptionYear>2024</inceptionYear>

diff --git a/cursorpaging-jpa/pom.xml b/cursorpaging-jpa/pom.xml
@@ -12,7 +12,7 @@
   <artifactId>cursorpaging-jpa</artifactId>
   <version>0-SNAPSHOT</version>
 
-  <name>Spring-CursorPaging::JPA</name>
+  <name>Spring-CursorPaging :: JPA</name>
   <description>Cursor paging support for Spring Data</description>
   <url>https://github.com/p3t/spring-cursorpaging/</url>
   <inceptionYear>2024</inceptionYear>
@@ -136,6 +136,13 @@
       <artifactId>testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- (Overwrite) Dependency from testcontainers: https://osv.dev/vulnerability/GHSA-4g9r-vxhx-9pgx -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.27.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/cursorpaging-jpa/src/test/java/io/vigier/cursorpaging/jpa/itest/TestDataGenerator.java b/cursorpaging-jpa/src/test/java/io/vigier/cursorpaging/jpa/itest/TestDataGenerator.java
@@ -97,7 +97,7 @@ public List<DataRecord> generateDataRecords( final int count ) {
                     .tags( someTags( tags, i ) )
                     .build() ) );
         }
-        log.info( "Generated {} test data-records", dataRecordRepository.count() );
+        log.debug( "Generated {} test data-records", dataRecordRepository.count() );
         return allRecords;
     }
 

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
   <modules>
     <module>cursorpaging-jpa</module>
     <module>cursorpaging-jpa-api</module>
+    <module>cursorpaging-examples/webapp-with-maven</module>
   </modules>
 
   <name>Spring-CursorPaging</name>
@@ -56,18 +57,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <!--      <dependency>-->
-      <!--        <groupId>jakarta.validation</groupId>-->
-      <!--        <artifactId>jakarta.validation-api</artifactId>-->
-      <!--        <version>3.1.0</version>-->
-      <!--        <scope>compile</scope>-->
-      <!--      </dependency>-->
-      <!--      <dependency>-->
-      <!--        <groupId>jakarta.persistence</groupId>-->
-      <!--        <artifactId>jakarta.persistence-api</artifactId>-->
-      <!--        <version>3.2.0</version>-->
-      <!--      </dependency>-->
-
       <dependency>
         <groupId>org.hibernate.common</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
@@ -104,13 +93,6 @@
         <type>pom</type>
       </dependency>
 
-
-      <!-- Use: compile -->
-      <!--      <dependency>-->
-      <!--        <groupId>com.google.protobuf</groupId>-->
-      <!--        <artifactId>protobuf-javalite</artifactId>-->
-      <!--        <version>${protobuf.version}</version>-->
-      <!--      </dependency>-->
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
@@ -168,6 +150,7 @@
         <artifactId>junit-jupiter</artifactId>
         <version>5.10.5</version>
       </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -280,9 +263,9 @@
               <goals>
                 <goal>sign</goal>
               </goals>
-              <!--              <configuration>-->
-              <!--                <signer>bc</signer>-->
-              <!--              </configuration>-->
+              <configuration>
+                <signer>bc</signer>
+              </configuration>
             </execution>
           </executions>
         </plugin>
@@ -295,7 +278,10 @@
           <configuration>
             <publishingServerId>central</publishingServerId>
             <waitUntil>validated</waitUntil>
-            <deploymentName>Spring-CursorPaging</deploymentName>
+            <deploymentName>Spring-CursorPaging-${project.version}</deploymentName>
+            <excludeArtifacts>
+              <artifact>cursorpaging-examples/webapp-with-maven</artifact>
+            </excludeArtifacts>
           </configuration>
         </plugin>
 
@@ -339,6 +325,10 @@
           <name>central</name>
         </property>
       </activation>
+      <modules>
+        <module>cursorpaging-jpa</module>
+        <module>cursorpaging-jpa-api</module>
+      </modules>
       <build>
         <plugins>
           <plugin>