fix for keeping the maven repo after mvn clean (#3), Dockerfile updat…

…ed with Temurin JRE 11 (#4)
OpenPj · Nov 24, 2023 · 84570ff · 84570ff
1 parent 8ce92a4
commit 84570ff
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 22 deletions.
diff --git a/mcf-docker-overlay/pom.xml b/mcf-docker-overlay/pom.xml
@@ -112,7 +112,6 @@
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 				<configuration>
-					<extensions>true</extensions>
 					<keepRunning>false</keepRunning>
 					<skip>false</skip>
 					<showLogs>true</showLogs>
@@ -188,24 +187,24 @@
 							<driver>local</driver>
 						</volume>
 					</volumes>
-					<executions>
-						<execution>
-							<id>start-docker</id>
-							<phase>pre-integration-test</phase>
-							<goals>
-								<goal>build</goal>
-								<goal>start</goal>
-							</goals>
-						</execution>
-						<execution>
-							<id>stop-docker</id>
-							<phase>post-integration-test</phase>
-							<goals>
-								<goal>stop</goal>
-							</goals>
-						</execution>
-					</executions>
 				</configuration>
+				<executions>
+					<execution>
+						<id>start-docker</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>build</goal>
+							<goal>start</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>stop-docker</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/mcf-docker-overlay/src/main/docker/Dockerfile b/mcf-docker-overlay/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM openjdk:11-jre
+FROM eclipse-temurin:11-jre
 LABEL maintainer="The Apache ManifoldCF Project"
 
-ARG MCF_VERSION=2.21
+ARG MCF_VERSION=2.26
 ARG MCF_USER=manifoldcf
 ARG MCF_USER_ID=100001
 

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
 		<maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
-
+		<maven.clean.plugin.version>3.3.2</maven.clean.plugin.version>
 		<postgresql.version>13.1</postgresql.version>
 	</properties>
 
@@ -45,6 +45,11 @@
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>${maven.dependency.plugin.version}</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>${maven.clean.plugin.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>io.fabric8</groupId>
 					<artifactId>docker-maven-plugin</artifactId>
@@ -82,6 +87,24 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+				    <excludeDefaultDirectories>true</excludeDefaultDirectories>
+				    <filesets>
+				        <fileset>
+				            <directory>target</directory>
+				            <includes>
+				                <include>**</include>
+				            </includes>
+				            <excludes>
+				                <exclude>mcf-maven-repo/**</exclude>
+				            </excludes>
+				        </fileset>
+				    </filesets>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -94,7 +117,8 @@
 		<repository>
 			<id>mcf-maven-repo</id>
 			<name>ManifoldCF Local Repo</name>
-			<url>file:target/mcf-maven-repo</url>
+			<layout>default</layout>
+			<url>file:target/mcf-maven-repo/repository</url>
 		</repository>
 	</repositories>