CDI-738 Generate Jakarta EE version of CDI API (#393)

jakartaee · Nov 29, 2018 · 1769798 · 1769798
1 parent c1941db
commit 1769798
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: java
 sudo: false
+install: mvn -Pstaging install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+script: mvn -Pstaging test -B
 jdk:
   - oraclejdk8
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -25,10 +25,10 @@
 		<relativePath />
 	</parent>
 
-	<groupId>javax.enterprise</groupId>
-	<artifactId>cdi-api</artifactId>
+	<groupId>jakarta.enterprise</groupId>
+	<artifactId>jakarta.enterprise.cdi-api</artifactId>
 	<packaging>jar</packaging>
-	<version>2.1-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 
 	<name>CDI APIs</name>
 	<description>APIs for CDI (Contexts and Dependency Injection for Java)</description>
@@ -42,11 +42,6 @@
 		</license>
 	</licenses>
 
-	<ciManagement>
-		<system>Hudson</system>
-		<url>http://hudson.jboss.org</url>
-	</ciManagement>
-
 	<issueManagement>
 		<system>JIRA</system>
 		<url>http://jira.jboss.org/browse/CDI</url>
@@ -138,12 +133,13 @@
 
 	<properties>
 		<atinject.api.version>1</atinject.api.version>
-		<uel.api.version>3.0.0</uel.api.version>
-		<interceptor.api.version>1.2</interceptor.api.version>
+		<uel.api.version>3.0.2</uel.api.version>
+		<interceptor.api.version>1.2.3</interceptor.api.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
 		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<!-- Configure all dependencies (e.g. testing) -->
@@ -163,14 +159,14 @@
 			</dependency>
 
 			<dependency>
-				<groupId>javax.el</groupId>
-				<artifactId>javax.el-api</artifactId>
+				<groupId>jakarta.el</groupId>
+				<artifactId>jakarta.el-api</artifactId>
 				<version>${uel.api.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>javax.interceptor</groupId>
-				<artifactId>javax.interceptor-api</artifactId>
+				<groupId>jakarta.interceptor</groupId>
+				<artifactId>jakarta.interceptor-api</artifactId>
 				<version>${interceptor.api.version}</version>
 			</dependency>
 
@@ -179,13 +175,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>javax.el-api</artifactId>
+			<groupId>jakarta.el</groupId>
+			<artifactId>jakarta.el-api</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
+			<groupId>jakarta.interceptor</groupId>
+			<artifactId>jakarta.interceptor-api</artifactId>
 		</dependency>
 
 		<dependency>
@@ -247,6 +243,43 @@
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
+
+		<!--
+            This profile enables consuming artifacts from the ossrh staging
+            repository group.
+        -->
+		<profile>
+			<id>staging</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>sonatype-nexus-staging</id>
+					<name>Sonatype Nexus Staging</name>
+					<url>https://oss.sonatype.org/content/repositories/staging</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>sonatype-nexus-staging</id>
+					<name>Sonatype Nexus Staging</name>
+					<url>https://oss.sonatype.org/content/repositories/staging</url>
+					<releases>
+						<enabled>true</enabled>
+					</releases>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
 	</profiles>
 
 	<build>

diff --git a/pom.xml b/pom.xml
@@ -2,10 +2,10 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>javax.enterprise</groupId>
-    <artifactId>cdi-spec</artifactId>
+    <groupId>jakarta.enterprise</groupId>
+    <artifactId>jakarta.enterprise.cdi-spec</artifactId>
     <packaging>pom</packaging>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
 
 	<description>Parent module for CDI Specification</description>
 

diff --git a/release-utils.sh b/release-utils.sh
@@ -58,13 +58,13 @@ perl -pi -e "s/${OLDVERSION}/${NEWVERSION}/g" `find . -name \*.xml -or -name \*.
 snapshot()
 {
    echo "\n**** Deploying $archetype to ${SNAPSHOT_REPO_URL} \n"
-   mvn clean javadoc:jar deploy  -f api/pom.xml -DaltDeploymentRepository=${SNAPSHOT_REPO_ID}::default::${SNAPSHOT_REPO_URL}
+   mvn -Pstaging clean javadoc:jar deploy  -f api/pom.xml -DaltDeploymentRepository=${SNAPSHOT_REPO_ID}::default::${SNAPSHOT_REPO_URL}
 }
 
 release()
 {
    echo "\n**** Deploying $archetype to ${RELEASE_REPO_URL} \n"
-   mvn clean javadoc:jar deploy -f api/pom.xml -DaltDeploymentRepository=${RELEASE_REPO_ID}::default::${RELEASE_REPO_URL}
+   mvn -Pstaging clean javadoc:jar deploy -f api/pom.xml -DaltDeploymentRepository=${RELEASE_REPO_ID}::default::${RELEASE_REPO_URL}
 }
 
 OLDVERSION="1.0.0-SNAPSHOT"

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>javax.enterprise</groupId>
-		<artifactId>cdi-spec</artifactId>
-		<version>2.1-SNAPSHOT</version>
+		<groupId>jakarta.enterprise</groupId>
+		<artifactId>jakarta.enterprise.cdi-spec</artifactId>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>cdi-spec-doc</artifactId>
+	<artifactId>jakarta.enterprise.cdi-spec-doc</artifactId>
 	<packaging>pom</packaging>