You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/07/08 05:45:56 UTC
[myfaces-tobago] branch master updated: chore: update groupIds
javax -> jakarta
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new e532400 chore: update groupIds javax -> jakarta
e532400 is described below
commit e532400825b45db7bb9c35f93ca120cd10d35e8c
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jul 7 15:56:20 2021 +0200
chore: update groupIds javax -> jakarta
* Start Mojarra without Jetty-Maven-Profile
---
pom.xml | 16 ++++++++--------
tobago-assembly/pom.xml | 4 ++--
tobago-example/pom.xml | 7 ++++++-
tobago-example/tobago-example-demo/pom.xml | 4 ++--
.../10-intro/10-getting-started/Getting_Started.xhtml | 2 +-
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index b117086..a69e3c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -398,9 +398,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>4.0.1</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>4.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -483,9 +483,9 @@
<version>1.3.5</version>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.1.Final</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -559,8 +559,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index fb07b71..563c1dd 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -62,8 +62,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index fc17870..f7863a9 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -124,7 +124,6 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>2.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -234,6 +233,12 @@
<version>3.1.7.Final</version>
</dependency>
<dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <scope>provided</scope>
+ <!-- provided, because it's included in weld-servlet-shaded -->
+ </dependency>
+ <dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2.7</version>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 986a2fc..e0b5901 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -204,8 +204,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bval</groupId>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
index a52a244..9bbb953 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
@@ -82,7 +82,7 @@
You can select a specific JSF implementation with the <i>jsf</i> variable, like Mojarra.
- <demo-highlight language="bash">$ mvn jetty:run -Pjetty -Djsf=mojarra-2.3</demo-highlight>
+ <demo-highlight language="bash">$ mvn jetty:run -Djsf=mojarra-2.3</demo-highlight>
</tc:section>
It's also possible to run the demo in TomEE from Maven directly