Integrate activation 2.0.0,

fix speclicense in api jars, fix javadoc generation, add missing license/notice files in dist jars Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Aug 4, 2020 · fdad7f1 · fdad7f1
1 parent c5c9d66
commit fdad7f1
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 13 deletions.
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
@@ -145,7 +145,7 @@
 				${basedir}/target/javadoc/overview.html
 			    </overview>
 			    <bottom>
-<![CDATA[Copyright &#169; 2019 Eclipse Foundation.
+<![CDATA[Copyright &#169; 2019, 2020 Eclipse Foundation.
     Use is subject to
     <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
 ]]>

diff --git a/mail/pom.xml b/mail/pom.xml
@@ -202,7 +202,20 @@
 		    </archive>
 		</configuration>
 	    </plugin>
-	</plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <javadocDirectory>${main.basedir}/mail/src/main/java</javadocDirectory>
+                    <bottom>
+<![CDATA[Copyright &#169; 2019, 2020 Eclipse Foundation.<br>
+    Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
+]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>

diff --git a/mailapi/pom.xml b/mailapi/pom.xml
@@ -184,6 +184,19 @@
 		    </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <javadocDirectory>${main.basedir}/mail/src/main/java</javadocDirectory>
+                    <bottom>
+<![CDATA[Copyright &#169; 2019, 2020 Eclipse Foundation.<br>
+    Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
+]]>
+                    </bottom>
+                </configuration>
+            </plugin>
 	</plugins>
     </build>
 

diff --git a/mailapijar/pom.xml b/mailapijar/pom.xml
@@ -39,6 +39,15 @@
     <packaging>jar</packaging>
     <name>Jakarta Mail API jar</name>
 
+    <!-- for javadoc build to succeed -->
+    <dependencies>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
     <properties>
 	<mail.extensionName>
 	    jakarta.mail
@@ -160,7 +169,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
+                    <docfilessubdirs>true</docfilessubdirs>
+                    <javadocDirectory>${main.basedir}/mail/src/main/java</javadocDirectory>
                     <excludePackageNames>com.sun.*</excludePackageNames>
+                    <bottom>
+<![CDATA[Copyright &#169; 2019, 2020 Eclipse Foundation.<br>
+    Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
+]]>
+                    </bottom>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
     <properties>
 	<mail.version>${project.version}</mail.version>
 	<mail.spec.version>2.0</mail.spec.version>
-	<activation.version>2.0.0-RC3</activation.version>
+	<activation.version>2.0.0</activation.version>
 	<!-- defaults that are overridden in mail module -->
 	<mail.extensionName>
 	    ${project.groupId}.${project.artifactId}
@@ -547,6 +547,47 @@
 			    </sources>
 			</configuration>
 		    </execution>
+		    <execution>
+			<id>add-resource</id>
+			<phase>generate-resources</phase>
+			<goals>
+			    <goal>add-resource</goal>
+			</goals>
+			<configuration>
+			    <resources>
+				<resource>
+				    <directory>${main.basedir}</directory>
+				    <targetPath>META-INF</targetPath>
+				    <includes>
+					<include>LICENSE.md</include>
+					<include>NOTICE.md</include>
+				    </includes>
+				</resource>
+			    </resources>
+			</configuration>
+		    </execution>
+		</executions>
+	    </plugin>
+
+	    <!--
+		Directory plugin to find parent root directory absolute path.
+		Sets ${main.basedir}, used above with build-helper-maven-plugin
+		to include LICENSE.md and NOTICE.md in jar files.
+	    -->
+	    <plugin>
+		<groupId>org.commonjava.maven.plugins</groupId>
+		<artifactId>directory-maven-plugin</artifactId>
+		<executions>
+		    <execution>
+			<id>directories</id>
+			<goals>
+			    <goal>highest-basedir</goal>
+			</goals>
+			<phase>initialize</phase>
+			<configuration>
+			    <property>main.basedir</property>
+			</configuration>
+		    </execution>
 		</executions>
 	    </plugin>
 
@@ -595,7 +636,7 @@
 		<plugin>
 		    <groupId>org.apache.maven.plugins</groupId>
 		    <artifactId>maven-compiler-plugin</artifactId>
-		    <version>3.7.0</version>
+		    <version>3.8.1</version>
 		</plugin>
 		<plugin>
 		    <groupId>org.apache.maven.plugins</groupId>
@@ -653,17 +694,11 @@
 		<plugin>
 		    <groupId>org.apache.maven.plugins</groupId>
 		    <artifactId>maven-javadoc-plugin</artifactId>
-		    <version>3.1.1</version>
+		    <version>3.2.0</version>
 		    <configuration>
+                        <source>8</source>
 			<doclint>none</doclint>
-			<!-- make all the APIs available for javadoc -->
-			<additionalDependencies>
-			    <additionalDependency>
-				<groupId>com.sun.mail</groupId>
-				<artifactId>jakarta.mail</artifactId>
-				<version>${mail.version}</version>
-			    </additionalDependency>
-			</additionalDependencies>
+                        <detectJavaApiLink>false</detectJavaApiLink>
 			<sourceFileExcludes>
 			    <sourceFileExclude>
 				module-info.java