Merge pull request #32 from OpenNTF/pullrequests/sbasegmez/develop

Serdar's 6.0.0 changes

Author: jesse-gallagher

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018-2019 Jesse Gallagher.
+   Copyright 2018-2025 Contributors to the generate-domino-update-site project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

NOTICE.md

@@ -0,0 +1,9 @@
+generate-domino-update-site
+
+Portions (c) Copyright 2018-2025 Jesse Gallagher
+Portions (c) Copyright 2025 Serdar Basegmez
+
+This product includes software contributed to
+OpenNTF Alliance (http://www.OpenNTF.org/)
+
+This product is licensed under the terms of the Apache 2.0 license.

README.md

@@ -6,7 +6,7 @@ To use the tool from the command line, either add the OpenNTF Maven repository (
 
 ## Requirements
 
-- A Notes or Domino installation filesystem-accessible to the running computer
+- A Notes/Domino installation accessible on the running computer, or Domino Docker container/image on the local Docker daemon.
 - Maven 3+
 - Java 8+
 
@@ -16,11 +16,11 @@ To use the tool from the command line, either add the OpenNTF Maven repository (
 
 The tool performs several tasks to generate its result:
 
-1. Copies the features and plugins from the  `osgi/rcp/eclipe` and `osgi/shared/eclipse`  directories, converting unpacked folder artifacts back into Jar files
+1. Copies the features and plugins from the  `osgi/rcp/eclipe` and `osgi/shared/eclipse`  directories, converting unpacked folder artifacts back into Jar files. In `dotsOnly` mode, it copies `osgi-dots/rcp/eclipse` and `osgi-dots/shared/eclipse`  directories.
 2. If pointed to a Windows Notes installation directory, it will do the same with the `framework` directory, which contains UI-specific plugins
 3. Generates `com.ibm.notes.java.api` and `com.ibm.notes.java.api.win32.linux` bundles using Domino's Notes.jar with a version matching today's date, if needed
 4. Generates a `com.ibm.xsp.http.bootstrap` bundle in similar fashion, when the JAR is available in the source
-5. Downloads source bundles for open-source components found in Eclipse's Neon repository
+5. Downloads source bundles for open-source components found in Eclipse's compatible repository
 6. Creates a basic site.xml file
 7. Generates artifacts.jar and content.jar files
 
@@ -55,14 +55,32 @@ Add the OpenNTF Maven server to your ~/.m2/settings.xml file. For example:
 Execute the plugin with properties to point to the base of your Domino installation and the target folder. For example:
 
 ```sh
-$ mvn org.openntf.p2:generate-domino-update-site:5.0.0:generateUpdateSite \
+$ mvn org.openntf.p2:generate-domino-update-site:6.0.0:generateUpdateSite \
     -Dsrc="/Volumes/C/Program Files/IBM/Domino" \
     -Ddest="/Users/someuser/Desktop/UpdateSite" \
-	-DflattenEmbeds=false # optional
+    -DflattenEmbeds=false # optional
+    -DonlyDots=true # optional
 ```
 - `src` is the location of Domino. On Windows, this might be "C:\Program Files\IBM\Domino". If unspecified, the Mojo will attempt to find a Domino or Notes installation based on common locations
 - `dest` is where you want to save it to. For the Extension Library, this was historically "C:\UpdateSite", but it can be anywhere
 - `flattenEmbeds` will look for embedded JARs named with Bundle-ClassPath and expand their contents out into the main bundle
+- `onlyDots` will generate an update site for DOTS plugins.
+
+Alternatively, Docker container/image can be used to generate update site.
+
+```sh
+$ mvn org.openntf.p2:generate-domino-update-site:6.0.0:generateUpdateSite \
+    -DsrcContainer="domino-container" # Either srcContainer or srcImageId should be used
+    -DsrcImageId="Domino:latest"
+    -DdockerDominoDir="/opt/hcl/domino/notes/latest/linux"
+    -Ddest="/Users/someuser/Desktop/UpdateSite" \
+    -DflattenEmbeds=false # optional
+    -DonlyDots=true # optional
+```
+
+- `srcContainer` is the container to be used as the source. Will be ignored if an image id provided.
+- `srcImageId` is the image id to be used as the source. When given, mojo will create a temporary container with the image and remove when it's done.
+- `dockerDominoDir` is the directory to the domino installation inside the container. Default value (`/opt/hcl/domino/notes/latest/linux`) will be used if omitted. Mojo will pull necessary files to a temporary directory.
 
 Note: the `flattenEmbeds` option strips signature files and makes no attempt to merge conflicts between same-named files. Accordingly, the result bundles may not behave the same way as their original versions.
 

generate-domino-update-site/.gitignore

@@ -1 +1,46 @@
-/target/
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+.env
+
+### IntelliJ IDEA ###
+.idea/
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+### Miscellaneous ###
+*.log
+*.log.*
+*.bak
+

generate-domino-update-site/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openntf.p2</groupId>
 	<artifactId>generate-domino-update-site</artifactId>
-	<version>5.1.0-SNAPSHOT</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>generate-domino-update-site</name>
@@ -12,12 +12,27 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		
+		<maven.compiler.release>8</maven.compiler.release>
+
 		<!-- Maven API version. This version should be supported by m2e -->
-		<maven.api.version>3.8.6</maven.api.version>
+		<maven.api.version>3.9.9</maven.api.version>
+
+		<docker-java.version>3.4.2</docker-java.version>
+		<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
+		<plexus-utils.version>3.6.0</plexus-utils.version>
+		<com.ibm.commons.version>9.0.0</com.ibm.commons.version>
+		<org.openntf.nsfodp.commons.version>4.0.5</org.openntf.nsfodp.commons.version>
+		<org.eclipse.osgi.version>3.7.1</org.eclipse.osgi.version>
+		<mojo-executor.version>2.4.1</mojo-executor.version>
+		<tycho-osgi.version>3.13.0.v20180226-1711</tycho-osgi.version>
+		<commons-lang3.version>3.17.0</commons-lang3.version>
+		<commons-compress.version>1.27.1</commons-compress.version>
+		<commons-io.version>2.18.0</commons-io.version>
+		<xz.version>1.10</xz.version>
+		<junit.version>5.12.0</junit.version>
 	</properties>
 
-	<url>https://openntf.org/main.nsf/project.xsp?r=project/NSF%20ODP%20Tooling</url>
+	<url>https://www.openntf.org/main.nsf/project.xsp?r=project/Domino%20Update%20Site%20Generator</url>
 	<inceptionYear>2018</inceptionYear>
 
 	<licenses>
@@ -36,7 +51,7 @@
 			<url>https://artifactory.openntf.org/openntf</url>
 		</repository>
 	</distributionManagement>
-	
+
 	<repositories>
 		<repository>
 			<id>artifactory.openntf.org</id>
@@ -57,101 +72,112 @@
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
 			<version>${maven.api.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-core</artifactId>
 			<version>${maven.api.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-project</artifactId>
-			<version>2.2.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.7.1</version>
+			<version>${maven-plugin-annotations.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
-			<version>3.5.0</version>
+			<version>${plexus-utils.version}</version>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>com.ibm.sbt</groupId>
-		    <artifactId>com.ibm.commons</artifactId>
-		    <version>9.0.0</version>
+			<groupId>com.ibm.sbt</groupId>
+			<artifactId>com.ibm.commons</artifactId>
+			<version>${com.ibm.commons.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openntf.nsfodp</groupId>
 			<artifactId>org.openntf.nsfodp.commons</artifactId>
-			<version>3.9.0</version>
+			<version>${org.openntf.nsfodp.commons.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.7.1</version>
+			<version>${org.eclipse.osgi.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.twdata.maven</groupId>
 			<artifactId>mojo-executor</artifactId>
-			<version>2.4.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.26</version>
-			<scope>provided</scope>
+			<version>${mojo-executor.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.13.0.v20180226-1711</version>
+			<version>${tycho-osgi.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>${commons-lang3.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>${commons-compress.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.tukaani</groupId>
 			<artifactId>xz</artifactId>
-			<version>1.9</version>
+			<version>${xz.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.9.2</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-core</artifactId>
+			<version>${docker-java.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-transport-httpclient5</artifactId>
+			<version>${docker-java.version}</version>
+		</dependency>
+
 	</dependencies>
-	
+
 	<prerequisites>
 		<maven>3.0.1</maven>
 	</prerequisites>
-	
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.14.0</version>
 			</plugin>
-		
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.5.1</version>
+				<version>3.15.1</version>
 				<configuration>
 					<goalPrefix>generate-domino-update-site</goalPrefix>
 					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+
 				</configuration>
 				<executions>
 					<execution>
@@ -168,7 +194,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 
 			<plugin>
 				<groupId>com.mycila</groupId>
@@ -179,21 +205,21 @@
 					<header>license.txt</header>
 					<excludes>
 						<exclude>pom.xml</exclude>
-			            <exclude>**/README</exclude>
-			            <exclude>src/test/resources/**</exclude>
-			            <exclude>src/main/resources/**</exclude>
+						<exclude>**/README</exclude>
+						<exclude>src/test/resources/**</exclude>
+						<exclude>src/main/resources/**</exclude>
 					</excludes>
 					<properties>
-						<owner>Jesse Gallagher</owner>
-						<copyrightYear>2023</copyrightYear>
+						<owner>Contributors to the generate-domino-update-site project</owner>
+						<copyrightYear>2025</copyrightYear>
 					</properties>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0-M1</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<id>enforce-maven-and-java</id>