Skip to content

Commit

Permalink
Updating and tidying pom
Browse files Browse the repository at this point in the history 
* Update versions in pom
* Set to JDK 11
* Add enforcer for defined Maven version
* Remove old staging/build profiles (now done in EE4J parent)
* Removed unused dependency

Updated javadoc that prevented building on JDK 11 and JDK 17.

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
  • Loading branch information
@arjantijms
arjantijms committed Jun 10, 2022
1 parent 41589ae commit d79b092
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 190 deletions.
237 changes: 77 additions & 160 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Contributors to the Eclipse Foundation.
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
Expand All @@ -17,7 +19,6 @@
-->

<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>
Expand All @@ -30,11 +31,15 @@
<artifactId>jakarta.enterprise.concurrent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>org.glassfish.jakarta.enterprise.concurrent</name>
<description>Compatible Implementation of Jakarta Concurrency</description>
<url>https://projects.eclipse.org/projects/ee4j.cu</url>

<licenses>
<organization>
<name>Oracle Corporation</name>
<url>http://www.oracle.com/</url>
</organization>
<licenses>
<license>
<name>EPL 2.0</name>
<url>http://www.eclipse.org/legal/epl-2.0</url>
Expand All @@ -47,11 +52,6 @@
</license>
</licenses>

<scm>
<url>https://github.com/eclipse-ee4j/concurrency-ri</url>
<connection>scm:git:https://github.com/eclipse-ee4j/concurrency-ri.git</connection>
<developerConnection>scm:git:git@github.com:eclipse-ee4j/concurrency-ri.git</developerConnection>
</scm>
<developers>
<developer>
<id>anthony.lai</id>
Expand All @@ -65,14 +65,6 @@
</developer>
</developers>

<organization>
<name>Oracle Corporation</name>
<url>http://www.oracle.com/</url>
</organization>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/eclipse-ee4j/concurrency-ri/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>Concurrency mailing list</name>
Expand All @@ -83,29 +75,36 @@
</mailingList>
</mailingLists>

<scm>
<url>https://github.com/eclipse-ee4j/concurrency-ri</url>
<connection>scm:git:https://github.com/eclipse-ee4j/concurrency-ri.git</connection>
<developerConnection>scm:git:git@github.com:eclipse-ee4j/concurrency-ri.git</developerConnection>
</scm>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/eclipse-ee4j/concurrency-ri/issues</url>
</issueManagement>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.release>11</maven.compiler.release>
<jakarta.enterprise.concurrent-api.version>3.0.0</jakarta.enterprise.concurrent-api.version>
</properties>


<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
<version>${jakarta.enterprise.concurrent-api.version}</version>
</dependency>

<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.1.0</version>
<type>jar</type>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand All @@ -115,60 +114,87 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.1</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.0</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>3.0.0-M5</version>
</dependency>
</dependencies>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.4</version>
<configuration>
<!-- By default, we don't export anything.
-->
<Export-Package />
<instructions>
<_include>-${basedir}/osgi.bundle</_include>
</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</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>
<version>3.2.2</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.0</version>
<configuration>
<quiet>true</quiet>
<doctitle>Jakarta Concurrency Compatible Implementation ${project.version}</doctitle>
<bottom>
<![CDATA[Copyright (c) 2020 Eclipse Foundation.
<![CDATA[Copyright (c) 2020, 2022 Eclipse Foundation.
Use is subject to
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
]]>
</bottom>
<excludePackageNames>org.glassfish.enterprise.concurrent.management</excludePackageNames>
<source>1.8</source>
</configuration>
<executions>
<execution>
Expand All @@ -182,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -193,115 +219,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<!-- By default, we don't export anything.
-->
<Export-Package />
<instructions>
<_include>-${basedir}/osgi.bundle</_include>
</instructions>
</configuration>
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
<arguments>${release.arguments}</arguments>
</configuration>
</plugin>
</plugins>

</build>

<profiles>
<profile>
<id>re-build</id>
<activation>
<property>
<name>license.url</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0-beta-4</version>
<inherited>false</inherited>
<executions>
<execution>
<id>get-license</id>
<phase>package</phase>
<goals>
<goal>download-single</goal>
</goals>
<configuration>
<url>${license.url}</url>
<fromFile>TLDA_SCSL_Licensees_License_Notice.txt</fromFile>
<toDir>${project.build.directory}/license</toDir>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
<id>make-licensee-src-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>javax.enterprise.concurrent-${project.version}-sources-licensee</finalName>
<attach>false</attach>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly-src-licensee.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<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

0 comments on commit d79b092

Please sign in to comment.