Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jakarta spec fixes #98

Merged
merged 1 commit into from
Sep 28, 2018
Merged

Jakarta spec fixes #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 38 additions & 43 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -148,6 +165,7 @@
</execution>
</executions>
</plugin>

<!-- Configure the jar with the javadoc (or rather, convince Maven that
we want javadoc at all) -->
<plugin>
Expand Down Expand Up @@ -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>
Expand Down