Merge pull request #152 from xdev-software/develop

Release

Author: AB-xdev

.github/workflows/broken-links.yml

@@ -31,13 +31,13 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Close issue if everything is fine
-        if: env.lychee_exit_code == 0 && steps.find-issue.outputs.number != ''
+        if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
         run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
         env:
           GH_TOKEN: ${{ github.token }}
 
       - name: Create Issue From File
-        if: env.lychee_exit_code != 0
+        if: steps.lychee.outputs.exit_code != 0
         uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
         with:
           issue-number: ${{ steps.find-issue.outputs.number }}

.github/workflows/release.yml

@@ -104,9 +104,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare-release]
     timeout-minutes: 60
-    permissions:
-      contents: read
-      packages: write
     steps:
     - uses: actions/checkout@v4
 
@@ -121,15 +118,17 @@ jobs:
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'
+        server-id: github-central
+        server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
-    - name: Publish to Central Portal
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
+    - name: Publish to GitHub Packages Central
+      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Set up JDK
       uses: actions/setup-java@v4

.github/workflows/sonar.yml

@@ -10,9 +10,6 @@ jobs:
   publish-maven:
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    permissions:
-      contents: read
-      packages: write
     steps:
     - uses: actions/checkout@v4
 
@@ -21,14 +18,16 @@ jobs:
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'
+        server-id: github-central
+        server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
-    - name: Publish to GitHub Packages
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
+    - name: Publish to GitHub Packages Central
+      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
     - name: Set up JDK

.github/workflows/test-deploy.yml

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,8 @@
+# 2.1.0
+* Add customizer for ``TransferArchiveTARCompressor``
+* Create more predefined FileContentModifiers
+  * This allows to e.g. remove not needed Maven modules when building
+
 # 2.0.2
 * Don't try to pull reserved ``scratch`` image during build
 

CHANGELOG.md

@@ -1,6 +1,5 @@
 [![Latest version](https://img.shields.io/maven-central/v/software.xdev/testcontainers-advanced-imagebuilder?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/testcontainers-advanced-imagebuilder)
 [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/testcontainers-advanced-imagebuilder/check-build.yml?branch=develop)](https://github.com/xdev-software/testcontainers-advanced-imagebuilder/actions/workflows/check-build.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_testcontainers-advanced-imagebuilder&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_testcontainers-advanced-imagebuilder)
 
 # Advanced Image-Builder for Testcontainers Java
 

README.md

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
-	<version>2.0.3-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
-		<version>2.0.3-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>testcontainers-advanced-imagebuilder-demo</artifactId>
-	<version>2.0.3-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>

testcontainers-advanced-imagebuilder-demo/pom.xml

@@ -1,11 +1,15 @@
 package software.xdev;
 
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.slf4j.LoggerFactory;
 
 import software.xdev.testcontainers.imagebuilder.AdvancedImageFromDockerFile;
 import software.xdev.testcontainers.imagebuilder.compat.DockerfileCOPYParentsEmulator;
+import software.xdev.testcontainers.imagebuilder.transfer.fcm.FileLinesContentModifier;
 
 
 public final class Application
@@ -25,13 +29,46 @@ public static void main(final String[] args)
 				".md",
 				".cmd",
 				"/renovate.json5",
-				// We need to keep the pom.xml as maven can't resolve the modules otherwise
-				"testcontainers-advanced-imagebuilder/src/**",
-				"testcontainers-advanced-imagebuilder-demo/src/**"
+				"testcontainers-advanced-imagebuilder/**",
+				"testcontainers-advanced-imagebuilder-demo/**"
 			)
 			.withDockerFilePath(Paths.get("../testcontainers-advanced-imagebuilder-demo/Dockerfile"))
 			.withBaseDir(Paths.get("../"))
-			.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator());
+			.withDockerFileLinesModifier(new DockerfileCOPYParentsEmulator())
+			// Only copy the required maven modules and remove the not required ones
+			.withTransferArchiveTARCompressorCustomizer(c -> c.withContentModifier(
+				new FileLinesContentModifier()
+				{
+					@Override
+					public boolean shouldApply(
+						final Path sourcePath,
+						final String targetPath,
+						final TarArchiveEntry tarArchiveEntry)
+					{
+						return "pom.xml".equals(targetPath);
+					}
+					
+					@Override
+					public List<String> modify(
+						final List<String> lines,
+						final Path sourcePath,
+						final String targetPath,
+						final TarArchiveEntry tarArchiveEntry)
+					{
+						return lines.stream()
+							// Only keep the dummy-app submodule as this is only needed for building
+							.filter(s -> !(s.contains("<module>testcontainers-advanced-imagebuilder")
+								&& !s.contains("<module>testcontainers-advanced-imagebuilder-dummy-app")))
+							.toList();
+					}
+					
+					@Override
+					public boolean isIdentical(final List<String> original, final List<String> created)
+					{
+						return original.size() == created.size();
+					}
+				}
+			));
 
 		final String imageName = builder.get();