This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 0aa34a047 javax -> jakarta
0aa34a047 is described below
commit 0aa34a047a0f5f75d01b1740f466fd4467db7ee8
Author: tandraschko <[email protected]>
AuthorDate: Thu Jan 11 17:23:10 2024 +0100
javax -> jakarta
---
.../deltaspike/core/util/ProjectStageProducer.java | 2 +-
.../api/projectstage/ProjectStageProducerTest.java | 2 +-
.../data-examples/src/main/webapp/WEB-INF/web.xml | 4 ++--
.../jpa-examples/src/main/webapp/WEB-INF/web.xml | 4 ++--
.../jsf-examples/src/main/webapp/WEB-INF/web.xml | 4 ++--
.../jsf-playground/src/main/webapp/WEB-INF/web.xml | 6 +++---
.../src/main/webapp/WEB-INF/web.xml | 4 ++--
.../src/main/webapp/WEB-INF/web.xml | 4 ++--
.../impl/jsf/MockedJsf2TestContainer.java | 6 +++---
deltaspike/parent/code/pom.xml | 22 ----------------------
10 files changed, 18 insertions(+), 40 deletions(-)
diff --git
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index 4cd4ff566..006d192a5 100644
---
a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++
b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -60,7 +60,7 @@ public class ProjectStageProducer implements Serializable
{
//TODO discuss it
"org.apache.deltaspike.ProjectStage",
- "javax.faces.PROJECT_STAGE",
+ "jakarta.faces.PROJECT_STAGE",
"faces.PROJECT_STAGE"
};
diff --git
a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/ProjectStageProducerTest.java
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/ProjectStageProducerTest.java
index 5c774ad12..b6941bb72 100644
---
a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/ProjectStageProducerTest.java
+++
b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/projectstage/ProjectStageProducerTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class ProjectStageProducerTest
{
/**
- * Test a ProjectStage which got set by the <i>javax.faces.ProjectStage</i>
+ * Test a ProjectStage which got set by the
<i>jakarta.faces.ProjectStage</i>
*/
@Test
public void testProjectStageSetByEnvironment()
diff --git a/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/web.xml
index 76f7ba6a5..af4e3e4d2 100644
--- a/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/web.xml
+++ b/deltaspike/examples/data-examples/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git a/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/web.xml
index 76f7ba6a5..af4e3e4d2 100644
--- a/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/web.xml
+++ b/deltaspike/examples/jpa-examples/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/web.xml
index 76f7ba6a5..af4e3e4d2 100644
--- a/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/web.xml
+++ b/deltaspike/examples/jsf-examples/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/web.xml
index d2250f021..f9b53149c 100644
--- a/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/web.xml
+++ b/deltaspike/examples/jsf-playground/src/main/webapp/WEB-INF/web.xml
@@ -22,18 +22,18 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<context-param>
- <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-name>jakarta.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git
a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/web.xml
index 38c171e12..88bd0f61e 100644
---
a/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/web.xml
+++
b/deltaspike/examples/security-requested-page-after-login-cdi/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git
a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/web.xml
b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/web.xml
index 38c171e12..88bd0f61e 100644
---
a/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/web.xml
+++
b/deltaspike/examples/security-requested-page-after-login-picketlink/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,13 @@
version="3.0">
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-name>jakarta.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
diff --git
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
index 25c3d19f6..5da80acef 100644
---
a/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
+++
b/deltaspike/modules/test-control/impl/obsolete/src/main/java/org/apache/deltaspike/testcontrol/impl/jsf/MockedJsf2TestContainer.java
@@ -105,9 +105,9 @@ public class MockedJsf2TestContainer implements
ExternalContainer
protected void applyContainerConfig()
{
//add the default values
- servletContext.addInitParameter("javax.faces.PROJECT_STAGE",
"UnitTest");
- servletContext.addInitParameter("javax.faces.PARTIAL_STATE_SAVING",
"true");
- servletContext.addInitParameter("javax.faces.FACELETS_REFRESH_PERIOD",
"-1");
+ servletContext.addInitParameter("jakarta.faces.PROJECT_STAGE",
"UnitTest");
+ servletContext.addInitParameter("jakarta.faces.PARTIAL_STATE_SAVING",
"true");
+
servletContext.addInitParameter("jakarta.faces.FACELETS_REFRESH_PERIOD", "-1");
servletContext.addInitParameter("org.apache.myfaces.INITIALIZE_ALWAYS_STANDALONE",
"true");
servletContext.addInitParameter("org.apache.myfaces.spi.InjectionProvider",
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 1fc79fe03..28f20948d 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -36,8 +36,6 @@
<properties>
<container.unpack.directory>${java.io.tmpdir}/deltaspike-arquillian-containers</container.unpack.directory>
- <version.jaxb-api>2.3.1</version.jaxb-api>
- <version.jaxb>2.3.0.1</version.jaxb>
<version.activation>1.1.1</version.activation>
<version.annotation>1.3.2</version.annotation>
<bval.artifactId>bval-jsr303</bval.artifactId>
@@ -155,26 +153,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- Preparation for Java 9+, include a dependency on the JAXB APIs -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb-api}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${version.jaxb}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${version.jaxb}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
