Add license files to api jar

Update javadoc license files Use osgi plugin Signed-off-by: Scott M Stark <[email protected]>
jakartaee · May 18, 2020 · 0374d17 · 0374d17
1 parent 6498316
commit 0374d17
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -77,6 +77,17 @@
   </properties>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}</directory>
+        <includes>
+          <include>LICENSE.txt</include>
+          <include>NOTICE.md</include>
+        </includes>
+        <targetPath>META-INF</targetPath>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -119,6 +130,34 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>4.2.1</version>
+        <configuration>
+          <instructions>
+            <Implementation-Version>${spec_version}</Implementation-Version>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>osgi-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/src/main/javadoc/doc-files/speclicense.html b/src/main/javadoc/doc-files/speclicense.html
@@ -20,7 +20,7 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
   <li>All existing copyright notices, or if one does not exist, a notice
     (hypertext is preferred, but a textual representation is permitted)
     of the form: &quot;Copyright &copy; [$date-of-document]
-    &ldquo;Eclipse Foundation, Inc. &lt;&lt;url to this license&gt;&gt;
+    Eclipse Foundation, Inc. <a href="https://www.eclipse.org/legal/efsl.php">EFSL</a>;
     &quot;
   </li>
 </ul>
@@ -42,9 +42,10 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
 
 <p>The notice is:</p>
 
-<p>&quot;Copyright &copy; 2018 Eclipse Foundation. This software or
-  document includes material copied from or derived from [title and URI
-  of the Eclipse Foundation specification document].&quot;</p>
+<p>&quot;Copyright &copy; 2018,2020 Eclipse Foundation. This software or
+  document includes material copied from or derived from
+  <a href="https://jakarta.ee/specifications/dependency-injection/2.0/">Jakarta Dependency Injection API</a>.
+&quot;</p>
 
 <h2>Disclaimers</h2>