enh: remove workaround for jakartaee/data#361

jakartaee · Jan 30, 2024 · 0ac3a63 · 0ac3a63
1 parent 77cb016
commit 0ac3a63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/jakartaee-bom/pom.xml b/jakartaee-bom/pom.xml
@@ -222,7 +222,7 @@
             </dependency>
             <dependency>
                 <groupId>jakarta.data</groupId>
-                <artifactId>jakarta-data-api</artifactId>
+                <artifactId>jakarta.data-api</artifactId>
                 <version>${jakarta.data.version}</version>
             </dependency>
 

diff --git a/jakartaee-web-api/pom.xml b/jakartaee-web-api/pom.xml
@@ -29,7 +29,7 @@
     <description>Jakarta EE Web Profile API</description>
 
     <properties>
-        <apidocs.modulepath>${jakarta.activation:jakarta.activation-api:jar}:${jakarta.xml.bind:jakarta.xml.bind-api:jar}:${jakarta.xml.soap:jakarta.xml.soap-api:jar}:${jakarta.xml.ws:jakarta.xml.ws-api:jar}:${jakarta.el:jakarta.el-api:jar}:${jakarta.data:jakarta-data-api:jar}</apidocs.modulepath>
+        <apidocs.modulepath>${jakarta.activation:jakarta.activation-api:jar}:${jakarta.xml.bind:jakarta.xml.bind-api:jar}:${jakarta.xml.soap:jakarta.xml.soap-api:jar}:${jakarta.xml.ws:jakarta.xml.ws-api:jar}:${jakarta.el:jakarta.el-api:jar}:${jakarta.data:jakarta.data-api:jar}</apidocs.modulepath>
     </properties>
 
     <build>
@@ -141,7 +141,7 @@
         </dependency>
         <dependency>
             <groupId>jakarta.data</groupId>
-            <artifactId>jakarta-data-api</artifactId>
+            <artifactId>jakarta.data-api</artifactId>
             <version>${jakarta.data.version}</version>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
         <jakarta.authentication-api.version>3.1.0-M1</jakarta.authentication-api.version>
         <jakarta.security.enterprise-api.version>4.0.0-M1</jakarta.security.enterprise-api.version>
         <jakarta.enterprise.concurrent-api.version>3.1.0-M1</jakarta.enterprise.concurrent-api.version>
-        <jakarta.data.version>1.0.0-M1</jakarta.data.version>
+        <jakarta.data.version>1.0.0-M3</jakarta.data.version>
         <jakarta.enterprise.cdi-el-api.version>4.1.0-M1</jakarta.enterprise.cdi-el-api.version>
 
         <!--  Platform -->
@@ -373,8 +373,6 @@
                                             <include name="**/*"/>
                                         </fileset>
                                     </copy>
-                                    <!-- Workaround for https://github.com/jakartaee/data/issues/361 -->
-                                    <move file="${apidocs.api.src}/jakarta-data" tofile="${apidocs.api.src}/jakarta.data"/>
                                     <move file="${apidocs.api.src}/jakarta.enterprise.cdi-el" tofile="${apidocs.api.src}/jakarta.cdi.el"/>
 
                                     <copy todir="${apidocs.api.src}/jakarta.faces" >