You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2020/06/18 15:09:15 UTC

[tomee-tck] branch jakartaee9-tck updated: Switch all dists over to the "jakartaee9" versions

This is an automated email from the ASF dual-hosted git repository.

dblevins pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git


The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
     new da8b3ba  Switch all dists over to the "jakartaee9" versions
da8b3ba is described below

commit da8b3ba34f110679f3ce188e0fede6bfaa67fd77
Author: David Blevins <da...@gmail.com>
AuthorDate: Thu Jun 18 08:08:46 2020 -0700

    Switch all dists over to the "jakartaee9" versions
---
 JAKARTAEE9.adoc | 24 +-----------------------
 pom.xml         | 12 ++++++------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/JAKARTAEE9.adoc b/JAKARTAEE9.adoc
index 1645625..fbec1a0 100644
--- a/JAKARTAEE9.adoc
+++ b/JAKARTAEE9.adoc
@@ -64,29 +64,7 @@ If you have that profile in your ``~/.m2/settings.xml` already due to Jakarta EE
 
 ## Overwrite TomEE Distributions (hack)
 
-After a successful TomEE build you need to overwrite the regular distributions with the Jakarta EE modified distributions.
-
-INFO: Long-term our modified binaries will hopefully live at `org.apache.tomee:apache-tomee:apache-tomee-plume:zip:9.0.0-SNAPSHOT` without a "jakartaee9" classifier and this hack won't be necessary
-
-In `tomee/apache-tomee/` of the main TomEE repo, create a file called `install.sh` with these contents and run it.
-
-[source,bash]
-----
-#!/bin/bash
-
-for n in target/*jakarta*.zip; do
-    classifier=${n/-jakartaee*/}
-    classifier=${classifier/*apache-tomee-/}
-
-    mvn install:install-file -Dfile=$n \
-                         -DgroupId=org.apache.tomee \
-                         -DartifactId=apache-tomee \
-                         -Dversion=8.0.3-SNAPSHOT \
-                         -Dpackaging=zip \
-                         -Dclassifier=$classifier \
-                         -DgeneratePom=true
-done
-----
+No longer necessary.
 
 ## Run your favorite test
 
diff --git a/pom.xml b/pom.xml
index 632fe65..f4635d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,7 +438,7 @@
                       <version>${tomee.version}</version>
                       <type>zip</type>
                       <outputDirectory>${project.build.directory}</outputDirectory>
-                      <classifier>webprofile</classifier>
+                      <classifier>webprofile-jakartaee9</classifier>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -455,7 +455,7 @@
           <artifactId>apache-tomee</artifactId>
           <type>zip</type>
           <version>${tomee.version}</version>
-          <classifier>webprofile</classifier>
+          <classifier>webprofile-jakartaee9</classifier>
         </dependency>
 
       </dependencies>
@@ -496,7 +496,7 @@
                       <version>${tomee.version}</version>
                       <type>zip</type>
                       <outputDirectory>${project.build.directory}</outputDirectory>
-                      <classifier>plus</classifier>
+                      <classifier>plus-jakartaee9</classifier>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -513,7 +513,7 @@
           <artifactId>apache-tomee</artifactId>
           <type>zip</type>
           <version>${tomee.version}</version>
-          <classifier>plus</classifier>
+          <classifier>plus-jakartaee9</classifier>
         </dependency>
 
       </dependencies>
@@ -554,7 +554,7 @@
                       <version>${tomee.version}</version>
                       <type>zip</type>
                       <outputDirectory>${project.build.directory}</outputDirectory>
-                      <classifier>plume</classifier>
+                      <classifier>plume-jakartaee9</classifier>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -571,7 +571,7 @@
           <artifactId>apache-tomee</artifactId>
           <type>zip</type>
           <version>${tomee.version}</version>
-          <classifier>plume</classifier>
+          <classifier>plume-jakartaee9</classifier>
         </dependency>
 
       </dependencies>