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

Tidy and update poms to include Jakarta EE 11 versions of dependencies #146

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tidy and update poms to include Jakarta EE 11 versions of dependencies #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f37df0a
Update and tidy poms
arjantijms Mar 25, 2024
d374aa7
Ignore generated flattened pom
arjantijms Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions api/.gitignore
View file
Open in desktop
@@ -0,0 +1 @@
/.flattened-pom.xml
229 changes: 140 additions & 89 deletions api/pom.xml
View file
Open in desktop
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2024 Contributors to Eclipse Foundation.
Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand All @@ -17,30 +18,34 @@

-->

<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/maven-v4_0_0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
</parent>

<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
<version>2.1.1-SNAPSHOT</version>

<properties>
<extension.name>jakarta.resource</extension.name>
<spec.version>2.1</spec.version>
<non.final>false</non.final>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.5.0.0</spotbugs.version>
</properties>

<name>${extension.name} API</name>
<description>Jakarta Connectors ${spec.version}</description>

<url>https://github.com/eclipse-ee4j/jca-api</url>
<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>GPL2 w/ CPE</name>
<url>https://www.gnu.org/software/classpath/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
Expand All @@ -56,41 +61,56 @@
<organizationUrl>http://www.payara.fish/</organizationUrl>
</developer>
</developers>

<contributors>
<contributor>
<name>Sivakumar Thyagarajan</name>
<organization>Oracle, Inc.</organization>
</contributor>
</contributors>

<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
<distribution>repo</distribution>
</license>
<license>
<name>GPL2 w/ CPE</name>
<url>https://www.gnu.org/software/classpath/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/jca-api/issues</url>
</issueManagement>
<scm>
<connection>scm:git:ssh://git@github.com/eclipse-ee4j/jca-api.git</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/jca-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/jca-api</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>github</system>
<url>https://github.com/eclipse-ee4j/jca-api/issues</url>
</issueManagement>

<properties>
<extension.name>jakarta.resource</extension.name>
<spec.version>2.1</spec.version>
<non.final>false</non.final>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.5.0.0</spotbugs.version>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
Expand All @@ -111,9 +131,11 @@
</execution>
</executions>
</plugin>

<!-- Restricts the Java version -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.12.1</version>
<configuration>
<release>11</release>
<compilerArgs>
Expand All @@ -124,15 +146,14 @@
<showWarnings>true</showWarnings>
</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>
<version>2.2</version>
<configuration>
<specMode>jakarta</specMode>
<spec>
<nonFinal>${non.final}</nonFinal>
<jarType>api</jarType>
<specVersion>${spec.version}</specVersion>
<specImplVersion>${project.version}</specImplVersion>
<apiPackage>${extension.name}</apiPackage>
Expand All @@ -146,11 +167,13 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>

<!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.3</version>
<version>5.1.9</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
Expand All @@ -169,6 +192,8 @@
<Implementation-Vendor-Id>org.glassfish</Implementation-Vendor-Id>
<Import-Package>jakarta.transaction;version="[2.0,3.0)",*</Import-Package>
<_include>-${basedir}/osgi.bundle</_include>
<_noimportjava>true</_noimportjava>
<_runee>JavaSE-11</_runee>
</instructions>
</configuration>
<executions>
Expand All @@ -181,10 +206,10 @@
</execution>
</executions>
</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.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -194,10 +219,84 @@
</archive>
</configuration>
</plugin>

<!-- Creates the source jar -->
<plugin>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<includePom>true</includePom>
</configuration>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!--
Create Javadoc for API jar
-->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultEntries>false</addDefaultEntries>
</manifest>
</archive>
<doclint>none</doclint>
<notimestamp>true</notimestamp>
<docfilessubdirs>true</docfilessubdirs>
<quiet>true</quiet>
<header><![CDATA[<br>Jakarta Connectors API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:jca-dev@eclipse.org">jca-dev@eclipse.org</a>.<br>
Copyright &#169; 2020, ${current.year} Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
<groups>
<group>
<title>Jakarta(tm) Connectors API Documentation</title>
<packages>jakarta.resource</packages>
</group>
</groups>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.6.0</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>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.5.0</version>
<executions>
<execution>
<id>currentyear-property</id>
Expand Down Expand Up @@ -232,36 +331,7 @@
</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 Connectors API v${project.version}]]></header>
<bottom>
<![CDATA[Copyright (c) 2020, ${current.year} Eclipse Foundation.
Use is subject to
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
]]>
</bottom>
<groups>
<group>
<title>Jakarta(tm) Connectors API Documentation</title>
<packages>jakarta.resource</packages>
</group>
</groups>
</configuration>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
Expand All @@ -274,23 +344,4 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.0</version>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>