From b8a7d6e30534598f8d5ae13dcb8265b72d2f909e Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Fri, 28 Sep 2018 18:15:12 +0100
Subject: [PATCH] Jakarta spec fixes

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
---
 pom.xml | 81 +++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1936269..9f502e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
 
         <non_final>true</non_final>
         <spec_version>1.0</spec_version>
-        <spec_impl_version>${project.version}</spec_impl_version>
         <new_spec_version>1.1</new_spec_version>
         <spec_build>01</spec_build>
 
@@ -97,11 +96,40 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
             </plugin>
+            
+            <!-- First sets properties for the maven-bundle-plugin and later checks if they are indeed used. -->
+            <plugin>
+                <groupId>org.glassfish.build</groupId>
+                <artifactId>spec-version-maven-plugin</artifactId>
+                <version>1.5</version>
+                <configuration>
+                    <specMode>jakarta</specMode>
+                    <spec>
+                        <nonFinal>${non_final}</nonFinal>
+                        <jarType>api</jarType>
+                        <specVersion>${spec_version}</specVersion>
+                        <specImplVersion>${project.version}</specImplVersion>
+                        <apiPackage>${api_package}</apiPackage>
+                        
+                        <newSpecVersion>${new_spec_version}</newSpecVersion>
+                        <specBuild>${spec_build}</specBuild>
+                    </spec>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>set-spec-properties</goal>
+                            <goal>check-module</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <!--
-             This plugin is responsible for packaging artifacts
-             as OSGi bundles.  Please refer to
-             http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
-             for more information about how to use this plugin.
+                This plugin is responsible for packaging artifacts
+                as OSGi bundles.  Please refer to
+                http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
+                for more information about how to use this plugin.
             -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -110,6 +138,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>java.security.enterprise</Automatic-Module-Name>
                         <Bundle-Version>${spec.bundle.version}</Bundle-Version>
                         <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
                         <Extension-Name>${spec.extension.name}</Extension-Name>
@@ -120,19 +149,7 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <!-- Provide a stable automatic module name so other artifacts can depend on project -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>java.security.enterprise</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
+            
             <!-- Configure the jar with the sources (or rather, convince Maven that
             we want sources at all) -->
             <plugin>
@@ -148,6 +165,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <!-- Configure the jar with the javadoc (or rather, convince Maven that
             we want javadoc at all) -->
             <plugin>
@@ -203,32 +221,9 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.glassfish.build</groupId>
-                <artifactId>spec-version-maven-plugin</artifactId>
-                <version>1.3</version>
-                <configuration>
-                    <spec>
-                        <jarType>api</jarType>
-                        <nonFinal>${non_final}</nonFinal>
-                        <apiPackage>${api_package}</apiPackage>
-                        <specVersion>${spec_version}</specVersion>
-                        <specImplVersion>${spec_impl_version}</specImplVersion>
-                        <newSpecVersion>${new_spec_version}</newSpecVersion>
-                        <specBuild>${spec_build}</specBuild>
-                    </spec>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>set-spec-properties</goal>
-                            <goal>check-module</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
 -->
+        
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>