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

Jump to bottom

Tidying poms #238

Merged
merged 4 commits into from
Jun 27, 2022
Merged

Tidying poms #238

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00b6be9
Tidying poms
arjantijms Jun 24, 2022
e69fcfe
Replaced 5.1.6 bundle with 5.1.4, which still works.
arjantijms Jun 24, 2022
2cfd2ab
Fix URLs and bundle plug-in.
arjantijms Jun 24, 2022
a2b595b
Fix copy/paste mistakes after feedback
arjantijms Jun 26, 2022
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
276 changes: 142 additions & 134 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,69 @@
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.concurrent-api</artifactId>

<name>Jakarta Concurrency</name>
<description>Jakarta Concurrency API Module</description>
<description>
Jakarta Concurrency provides a specification for using concurrency from application
components without compromising container integrity while still preserving the Jakarta EE
platform’s fundamental benefits.
</description>
<url>https://github.com/jakartaee/concurrency</url>

<properties>
<scm>
<connection>scm:git:https://github.com/jakartaee/concurrency.git</connection>
<developerConnection>scm:git:[email protected]:jakartaee/concurrency.git</developerConnection>
<url>https://github.com/jakartaee/concurrency</url>
</scm>

<api_package>jakarta.enterprise.concurrent</api_package>
<non.final>false</non.final> <!-- switch back to true once release is completed -->
<last.spec_version>2.0</last.spec_version>
<next.spec_version>3.0</next.spec_version>
<spec.version>${next.spec_version}</spec.version>
<new.spec.version>3.1</new.spec.version>
<build_number />
<packages.export>jakarta.enterprise.concurrent.*; version=${spec.bundle.version}</packages.export>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</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>2.1</version>
<configuration>
<spec>
<specVersion>${spec.version}</specVersion>
<specImplVersion>3.0.1</specImplVersion>
<apiPackage>${api_package}</apiPackage>

<nonFinal>${non.final}</nonFinal>
<newSpecVersion>${new.spec.version}</newSpecVersion>
<specBuild>${build_number}</specBuild>
<specVersion>3.0</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>jakarta.enterprise.concurrent</apiPackage>
</spec>
</configuration>
<executions>
Expand All @@ -70,26 +92,27 @@
</execution>
</executions>
</plugin>
<!--
This plugin is reponsible 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.
-->

<!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.1</version>
<extensions>true</extensions>
<version>5.1.4</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
</supportedProjectTypes>
<instructions>
<Bundle-Version>${spec.bundle.version}</Bundle-Version>
<Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
<Extension-Name>${spec.extension.name}</Extension-Name>
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
<Specification-Version>${spec.specification.version}</Specification-Version>
<Bundle-Description>
Jakarta Concurrency ${spec.specification.version} Specification
</Bundle-Description>
<specversion>${spec.specification.version}</specversion>
<Export-Package>${packages.export}</Export-Package>
<Export-Package>jakarta.enterprise.concurrent.*; version=${spec.bundle.version}</Export-Package>
</instructions>
</configuration>
<executions>
Expand All @@ -102,73 +125,81 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</configuration>
</plugin>

<!--
Create Javadoc for API jar
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<configuration>
<format>{0,date,MM/dd/yyyy hh:mm aa}</format>
<items>
<item>timestamp</item>
</items>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<phase>validate</phase>
<id>attach-api-javadocs</id>
<goals>
<goal>create</goal>
<goal>jar</goal>
</goals>
<configuration>
<source>11</source>
<quiet>true</quiet>
<additionalJOption>-Xdoclint:none</additionalJOption>
<description>Jakarta Concurrency API documentation</description>
<doctitle>Jakarta Concurrency API documentation</doctitle>
<windowtitle>Jakarta Concurrency API documentation</windowtitle>
<header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:[email protected]">[email protected]</a>.<br>
arjantijms marked this conversation as resolved.
Show resolved Hide resolved
Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
<docfilessubdirs>true</docfilessubdirs>
<groups>
<group>
<title>Jakarta Authentication API Documentation</title>
arjantijms marked this conversation as resolved.
Show resolved Hide resolved
<packages>
jakarta.enterprise.concurrent
</packages>
</group>
</groups>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<configuration>
<archive>
<manifest>
<addDefaultEntries>false</addDefaultEntries>
</manifest>
</archive>
<source>11</source>
<doclint>none</doclint>
<notimestamp>true</notimestamp>
<docfilessubdirs>true</docfilessubdirs>
<quiet>true</quiet>
<header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
<bottom>
<![CDATA[Copyright (c) 2020, 2022 Eclipse Foundation.
Use is subject to
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
]]>
</bottom>
<groups>
<group>
<title>Jakarta(tm) Concurrency API Documentation</title>
<packages>jakarta.enterprise.concurrent</packages>
</group>
</groups>
</configuration>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>validate</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>add-resource</id>
Expand All @@ -191,22 +222,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>validate</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<goals>
Expand All @@ -216,6 +236,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand All @@ -234,51 +255,38 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.0.0-M7</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
<flattenMode>ossrh</flattenMode>
</configuration>
<executions>
<!-- enable flattening -->
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading