Merge pull request #1582 from digital-preservation/develop

MancunianSam · web-flow · commit 4cee8afd3689 · 2026-01-29T16:06:39.000Z
Revert javadoc removal
diff --git a/droid-api/pom.xml b/droid-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>droid-parent</artifactId>
 		<groupId>uk.gov.nationalarchives</groupId>
-		<version>6.9.11-SNAPSHOT</version>
+		<version>6.9.12-SNAPSHOT</version>
 		<relativePath>../droid-parent</relativePath>
 	</parent>
 
diff --git a/droid-binary/pom.xml b/droid-binary/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-build-tools/pom.xml b/droid-build-tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-command-line/pom.xml b/droid-command-line/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-container/pom.xml b/droid-container/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
     
diff --git a/droid-core-interfaces/pom.xml b/droid-core-interfaces/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-core/pom.xml b/droid-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-export-interfaces/pom.xml b/droid-export-interfaces/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
    <relativePath>../droid-parent</relativePath>
     </parent>
     
diff --git a/droid-export/pom.xml b/droid-export/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
     
diff --git a/droid-help/pom.xml b/droid-help/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
  
diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>uk.gov.nationalarchives</groupId>
     <artifactId>droid-parent</artifactId>
-    <version>6.9.11-SNAPSHOT</version>
+    <version>6.9.12-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>droid-parent</name>
@@ -188,6 +188,13 @@
                     <artifactId>maven-source-plugin</artifactId>
                     <version>3.4.0</version>
                 </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.12.0</version>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
@@ -439,6 +446,67 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <source>21</source>
+                </configuration>
+            </plugin>
+<!-- N.B. sourceFileExcludes won't work till version 2.11 is released
+            <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-javadoc-plugin</artifactId>
+    <configuration>
+        <links>
+            <link>${project.url}</link>
+            <link>${project.organization.url}</link>
+        </links>
+
+            <sourceFileExcludes>
+                <exclude>**/package-info.java</exclude>
+            </sourceFileExcludes>
+            <packagesheader>DROID Packages</packagesheader>
+        <doctitle>DROID 6.1.5-SNAPSHOT</doctitle>
+        <windowtitle>DROID 6.1.5-SNAPSHOT</windowtitle>
+        <bottom>
+            <![CDATA[
+Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="${project.organization.url}">${project.organization.name}</a>. All Rights Reserved
+]]>
+        </bottom>
+        <archive>
+            <manifest>
+                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+            <manifestEntries>
+                <Source-Revision>${buildNumber}</Source-Revision>
+                <Build-Timestamp>${timestamp}</Build-Timestamp>
+                <Source-Repository>${project.scm.connection}</Source-Repository>
+                <Description>${project.description}</Description>
+                <Website>${project.url}</Website>
+            </manifestEntries>
+        </archive>
+    </configuration>
+    <executions>
+        <execution>
+            <id>attach-javadocs</id>
+            <goals>
+                <goal>jar</goal>
+            </goals>
+        </execution>
+    </executions>
+</plugin>
+-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
diff --git a/droid-report-interfaces/pom.xml b/droid-report-interfaces/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
         
diff --git a/droid-report/pom.xml b/droid-report/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
     
diff --git a/droid-results/pom.xml b/droid-results/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>droid-parent</artifactId>
 		<groupId>uk.gov.nationalarchives</groupId>
-		<version>6.9.11-SNAPSHOT</version>
+		<version>6.9.12-SNAPSHOT</version>
 		<relativePath>../droid-parent</relativePath>
 	</parent>
 
diff --git a/droid-swing-ui/pom.xml b/droid-swing-ui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
   
diff --git a/droid-tools/pom.xml b/droid-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.11-SNAPSHOT</version>
+        <version>6.9.12-SNAPSHOT</version>
         <relativePath>droid-parent</relativePath>
     </parent>
 
