Skip to content

Commit

Permalink
Created parent pom with api and tck modules.
Browse files Browse the repository at this point in the history 
Skipping spec at this point

Signed-off-by: Steve Millidge <steve.millidge@payara.fish>
  • Loading branch information
@smillidge
smillidge committed Jan 19, 2022
1 parent 4765838 commit b111836
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 134 deletions.
77 changes: 4 additions & 73 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,48 +20,19 @@
<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>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>

<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
<version>3.0.0-SNAPSHOT</version>
<name>jakarta.enterprise.concurrent-api</name>
<description>Jakarta Concurrency</description>
<url>https://github.com/eclipse-ee4j/concurrency-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>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/concurrency-api.git</connection>
<developerConnection>scm:git:git@github.com:eclipse-ee4j/concurrency-api.git</developerConnection>
<url>https://github.com/eclipse-ee4j/concurrency-api</url>
</scm>
<developers>
<developer>
<id>anthony.lai</id>
<name>Anthony Lai</name>
<organization>Oracle</organization>
</developer>
</developers>

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

<api_package>jakarta.enterprise.concurrent</api_package>
<non.final>true</non.final>
Expand All @@ -73,26 +44,6 @@
<packages.export>jakarta.enterprise.concurrent.*; version=${spec.bundle.version}</packages.export>
</properties>

<organization>
<name>Oracle Corporation</name>
<url>http://www.oracle.com/</url>
</organization>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/eclipse-ee4j/concurrency-api/issues</url>
</issueManagement>

<mailingLists>
<mailingList>
<name>Concurrency mailing list</name>
<post>cu-dev@eclipse.org</post>
<subscribe>https://dev.eclipse.org/mailman/listinfo/cu-dev</subscribe>
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/cu-dev</unsubscribe>
<archive>https://dev.eclipse.org/mhonarc/lists/cu-dev/</archive>
</mailingList>
</mailingLists>

<build>
<pluginManagement>
<plugins>
Expand Down Expand Up @@ -242,7 +193,7 @@
<doctitle>Jakarta Concurrency ${project.version} API specification</doctitle>
<header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
<bottom>
<![CDATA[Copyright (c) 2020 Eclipse Foundation.
<![CDATA[Copyright (c) 2022 Eclipse Foundation.
Use is subject to
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
]]>
Expand Down Expand Up @@ -331,26 +282,6 @@
</build>

<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0.0.Alpha2</version>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
69 changes: 8 additions & 61 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@
-->
<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>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>

<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-tck</artifactId>
<version>3.0.0</version>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Jakarta Concurrency TCK</name>
Expand All @@ -47,26 +45,10 @@
</licenses>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>

<jakarta.concurrent.version.ga>3.0.0</jakarta.concurrent.version.ga>
<jakarta.concurrent.version.dev>3.0.0</jakarta.concurrent.version.dev>

<!-- TODO update to 6.0.0 -->
<jakarta.servlet.version>5.0.0</jakarta.servlet.version>

<!-- TODO update to 5.0.0 -->
<jakarta.ejb.version>4.0.0</jakarta.ejb.version>

<!-- TODO update to 4.0.0 -->
<jakarta.jsp.version>3.0.0</jakarta.jsp.version>

<jakarta.annotation.version>2.0.0</jakarta.annotation.version>

<testng.version>6.14.3</testng.version>
<arquillian.version>1.6.0.Final</arquillian.version>
<jakarta.concurrent.version.dev>${project.version}</jakarta.concurrent.version.dev>

</properties>
<dependencies>
<dependency>
Expand All @@ -75,42 +57,7 @@
<version>${jakarta.concurrent.version.dev}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>${jakarta.jsp.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>${jakarta.ejb.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>${arquillian.version}</version>
<scope>compile</scope>
</dependency>

</dependencies>
<build>
<resources>
Expand All @@ -124,4 +71,4 @@
</resource>
</resources>
</build>
</project>
</project>

0 comments on commit b111836

Please sign in to comment.