diff --git a/pom.xml b/pom.xml index 4334aff9..3758c334 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,6 @@ 2017 - 2.6.0.Final 11 11 1.6.0 @@ -48,8 +47,8 @@ 3.3.9 1.20 2.10.5 - 2.12.7.1 - 8.0 + 2.10.5.1 + 14.0.6 3.0.10.RELEASE 4.12 4.3.0.Final @@ -58,12 +57,24 @@ 2.17 ^_?[a-z][a-zA-Z0-9]*$ + + + + + org.jboss.arquillian + arquillian-bom + 1.9.1.Final + pom + test + + + - javax - javaee-api - 8.0 + jakarta.platform + jakarta.jakartaee-api + 10.0.0 provided @@ -71,6 +82,7 @@ org.primefaces primefaces ${primefaces.version} + jakarta @@ -111,6 +123,28 @@ test + + org.jboss.arquillian.junit + arquillian-junit-container + 1.9.1.Final + test + + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + 3.3.2 + test + + + + io.openliberty.arquillian + arquillian-liberty-managed-jakarta-junit + 2.1.4 + pom + test + + @@ -172,7 +206,7 @@ + value="java.io,java.net,java.util,jakarta.enterprise.inject.spi,jakarta.enterprise.context"/> @@ -294,78 +328,6 @@ sh - - thorntail - - true - - - - io.thorntail - jsf - - - - io.thorntail - cdi - - - - io.thorntail - jaxrs - - - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - test - - - - io.thorntail - arquillian - test - - - - - - - - io.thorntail - bom - ${version.thorntail} - pom - import - - - - - - mp-starter - - - io.thorntail - thorntail-maven-plugin - ${version.thorntail} - - - true - - - - - package - - - - - - - liberty @@ -414,13 +376,13 @@ org.jboss.arquillian.container arquillian-container-test-api - 1.6.0.Final + 1.9.1.Final test org.jboss.arquillian.junit arquillian-junit-container - 1.6.0.Final + 1.9.1.Final test diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java index 370b22f5..e77c7406 100644 --- a/src/it/java/org/eclipse/microprofile/starter/APITest.java +++ b/src/it/java/org/eclipse/microprofile/starter/APITest.java @@ -24,11 +24,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.wildfly.swarm.arquillian.DefaultDeployment; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import java.io.File; import java.io.FileNotFoundException; import java.nio.charset.StandardCharsets; @@ -44,7 +43,6 @@ * @author Michal Karm Babacek */ @RunWith(Arquillian.class) -@DefaultDeployment(type = DefaultDeployment.Type.WAR) public class APITest { public static final String API_URL = "http://127.0.0.1:9090/api"; diff --git a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java index 8ac25ed8..b6ab054c 100644 --- a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java +++ b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java @@ -32,12 +32,11 @@ import org.junit.Test; import org.junit.rules.TestName; import org.junit.runner.RunWith; -import org.wildfly.swarm.arquillian.DefaultDeployment; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Response; import java.io.File; import java.io.IOException; import java.util.concurrent.ExecutorService; @@ -70,7 +69,6 @@ * @author Michal Karm Babacek */ @RunWith(Arquillian.class) -@DefaultDeployment(type = DefaultDeployment.Type.WAR) public class TestMatrixTest { private static final Logger LOGGER = Logger.getLogger(TestMatrixTest.class.getName()); diff --git a/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java b/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java index 6e25233b..983a0b99 100644 --- a/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java +++ b/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java @@ -19,13 +19,14 @@ */ package org.eclipse.microprofile.starter.utils; -import org.apache.commons.io.FileUtils; + import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.codehaus.plexus.util.FileUtils; import org.eclipse.microprofile.starter.core.model.BuildTool; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/org/eclipse/microprofile/starter/DataBean.java b/src/main/java/org/eclipse/microprofile/starter/DataBean.java index 8daf1ee6..a7def868 100755 --- a/src/main/java/org/eclipse/microprofile/starter/DataBean.java +++ b/src/main/java/org/eclipse/microprofile/starter/DataBean.java @@ -25,10 +25,10 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.faces.model.SelectItem; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.faces.model.SelectItem; +import jakarta.inject.Named; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java b/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java index c91a0fcb..9a4b7bca 100755 --- a/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java @@ -24,8 +24,8 @@ import org.eclipse.microprofile.starter.core.artifacts.DirectoryCreator; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class FakeDirectoryCreator extends DirectoryCreator { diff --git a/src/main/java/org/eclipse/microprofile/starter/Version.java b/src/main/java/org/eclipse/microprofile/starter/Version.java index e6cce880..3d4186eb 100644 --- a/src/main/java/org/eclipse/microprofile/starter/Version.java +++ b/src/main/java/org/eclipse/microprofile/starter/Version.java @@ -21,8 +21,8 @@ import org.eclipse.microprofile.starter.core.files.FilesLocator; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Scanner; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java b/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java index 50d6d09d..1b841e8d 100755 --- a/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.eclipse.microprofile.starter.core.artifacts.FileCreator; -import javax.enterprise.context.SessionScoped; +import jakarta.enterprise.context.SessionScoped; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java index f6e9ebf3..9f64911d 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.spi.JessieAddon; import org.eclipse.microprofile.starter.spi.MavenHelper; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.*; public abstract class AbstractMicroprofileAddon extends AbstractAddon { diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java index fa9902fc..e24df3e8 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java @@ -35,9 +35,9 @@ import org.eclipse.microprofile.starter.core.model.OptionValue; import org.eclipse.microprofile.starter.spi.MavenHelper; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java index 9631b432..9244b427 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java @@ -22,8 +22,8 @@ import org.eclipse.microprofile.starter.core.model.JavaSEVersion; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java index c54be8af..671c6046 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java @@ -29,9 +29,9 @@ import org.eclipse.microprofile.starter.core.artifacts.MavenCreator; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java index c6c60e13..645f63cb 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java @@ -26,9 +26,9 @@ import org.eclipse.microprofile.starter.core.artifacts.MavenCreator; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java index 2ba4bdfd..d96f257a 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java @@ -25,8 +25,8 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java index f7c06b2f..979489db 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java @@ -25,8 +25,8 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java index f6c3c98d..26b49f6e 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.starter.core.artifacts.MavenCreator; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/ThorntailServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/ThorntailServer.java index f892be32..4f3b64ed 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/ThorntailServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/ThorntailServer.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.starter.core.artifacts.MavenCreator; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/TomeeServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/TomeeServer.java index e8fb6725..1d2a36c0 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/TomeeServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/TomeeServer.java @@ -28,8 +28,8 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildFlyServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildFlyServer.java index 946e8b2f..64c0da21 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildFlyServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildFlyServer.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildflySwarmServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildflySwarmServer.java index 6d41760d..e463e670 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildflySwarmServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/WildflySwarmServer.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.starter.core.artifacts.MavenCreator; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/AlternativesProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/AlternativesProvider.java index 53d95d6f..a5dbb8ee 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/AlternativesProvider.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/AlternativesProvider.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java index 943985cf..46b09eb1 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java @@ -28,7 +28,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashMap; import java.util.Map; @@ -69,7 +69,7 @@ public Map determineVariables(JessieModel model) { result.put("jakarta_ee_package", "jakarta"); } else { - result.put("jakarta_ee_package", "javax"); + result.put("jakarta_ee_package", "jakarta"); } if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50 diff --git a/src/main/java/org/eclipse/microprofile/starter/core/addon/AddonManager.java b/src/main/java/org/eclipse/microprofile/starter/core/addon/AddonManager.java index 39288525..eb1daedf 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/addon/AddonManager.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/addon/AddonManager.java @@ -27,9 +27,9 @@ import org.eclipse.microprofile.starter.spi.JessieGradleAdapter; import org.eclipse.microprofile.starter.spi.JessieMavenAdapter; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/AbstractCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/AbstractCreator.java index 1cfa31d5..e7f8e4c4 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/AbstractCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/AbstractCreator.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.core.files.ThymeleafEngine; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/BuildToolCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/BuildToolCreator.java index 7b29d29e..40594edf 100644 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/BuildToolCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/BuildToolCreator.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.inject.Inject; +import jakarta.inject.Inject; public class BuildToolCreator { diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/CDICreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/CDICreator.java index 533160ce..c116c16e 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/CDICreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/CDICreator.java @@ -26,7 +26,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; import org.eclipse.microprofile.starter.core.model.OptionValue; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/Creator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/Creator.java index 8de9028c..2ff31a39 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/Creator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/Creator.java @@ -26,8 +26,8 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; import org.eclipse.microprofile.starter.spi.JessieAddon; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/GradleCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/GradleCreator.java index fc5e602e..2dda353b 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/GradleCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/GradleCreator.java @@ -28,8 +28,8 @@ import org.eclipse.microprofile.starter.spi.JessieAddon; import org.eclipse.microprofile.starter.spi.JessieGradleAdapter; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/JavaCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/JavaCreator.java index a4fb7a88..480be440 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/JavaCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/JavaCreator.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.HashSet; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java index 2d6ca863..4ccdb6ea 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/MavenCreator.java @@ -34,8 +34,8 @@ import org.eclipse.microprofile.starter.spi.JessieMavenAdapter; import org.eclipse.microprofile.starter.spi.MavenHelper; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/TemplateEngine.java b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/TemplateEngine.java index efb4b8c3..02eb9383 100644 --- a/src/main/java/org/eclipse/microprofile/starter/core/artifacts/TemplateEngine.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/artifacts/TemplateEngine.java @@ -22,8 +22,8 @@ import org.eclipse.microprofile.starter.core.files.FileCopyEngine; import org.eclipse.microprofile.starter.core.files.ThymeleafEngine; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameter.java b/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameter.java index b25e028f..555f80dd 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameter.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameter.java @@ -22,7 +22,7 @@ */ package org.eclipse.microprofile.starter.core.config; -import javax.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; /** * diff --git a/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameterProducer.java b/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameterProducer.java index 559c87fb..072582ef 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameterProducer.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/config/ConfigurationParameterProducer.java @@ -22,8 +22,8 @@ */ package org.eclipse.microprofile.starter.core.config; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; /** * diff --git a/src/main/java/org/eclipse/microprofile/starter/core/file/ModelReader.java b/src/main/java/org/eclipse/microprofile/starter/core/file/ModelReader.java index 699c39c3..c4f5e821 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/file/ModelReader.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/file/ModelReader.java @@ -24,8 +24,8 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.InputStream; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/core/file/YAMLReader.java b/src/main/java/org/eclipse/microprofile/starter/core/file/YAMLReader.java index c3699c2d..3bbc18f9 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/file/YAMLReader.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/file/YAMLReader.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.eclipse.microprofile.starter.core.exception.TechnicalException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java b/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java index a6bd8547..fcced756 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/files/FileCopyEngine.java @@ -25,8 +25,8 @@ import com.google.common.io.ByteStreams; import org.eclipse.microprofile.starter.core.exception.TechnicalException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/files/FilesLocator.java b/src/main/java/org/eclipse/microprofile/starter/core/files/FilesLocator.java index c489dda5..1a5bc2fa 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/files/FilesLocator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/files/FilesLocator.java @@ -23,8 +23,8 @@ package org.eclipse.microprofile.starter.core.files; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/files/ThymeleafEngine.java b/src/main/java/org/eclipse/microprofile/starter/core/files/ThymeleafEngine.java index 4c50cc78..70f2d9ca 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/files/ThymeleafEngine.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/files/ThymeleafEngine.java @@ -26,9 +26,9 @@ import org.thymeleaf.context.Context; import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.StringWriter; import java.util.Map; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieMaven.java b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieMaven.java index c608c7ed..98f80940 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieMaven.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieMaven.java @@ -22,7 +22,7 @@ */ package org.eclipse.microprofile.starter.core.model; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * diff --git a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModel.java b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModel.java index 80eaa7d0..edcaac8a 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModel.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModel.java @@ -26,8 +26,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.eclipse.microprofile.starter.core.model.deserializer.OptionsDeserializer; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModelInitializer.java b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModelInitializer.java index 16395760..842e4d0c 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModelInitializer.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/model/JessieModelInitializer.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.core.exception.TechnicalException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/model/ModelManager.java b/src/main/java/org/eclipse/microprofile/starter/core/model/ModelManager.java index e8df5eb0..4919eb4d 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/model/ModelManager.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/model/ModelManager.java @@ -31,8 +31,8 @@ import org.eclipse.microprofile.starter.spi.JessieAddon; import org.eclipse.microprofile.starter.spi.JessieAlternativesProvider; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelLoader.java b/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelLoader.java index 44b4b32a..5b55f228 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelLoader.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelLoader.java @@ -28,9 +28,9 @@ import org.eclipse.microprofile.starter.core.file.YAMLReader; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelValues.java b/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelValues.java index 494cf79a..94621b03 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelValues.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/templates/TemplateModelValues.java @@ -25,8 +25,8 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; import org.eclipse.microprofile.starter.core.model.JessieSpecification; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidation.java b/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidation.java index a2b958f6..3bcab359 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidation.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidation.java @@ -29,8 +29,8 @@ import org.eclipse.microprofile.starter.core.templates.TemplateModelLoader; import org.eclipse.microprofile.starter.spi.JessieAddon; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidationException.java b/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidationException.java index d74d17ea..41e97628 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidationException.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/validation/ModelValidationException.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.starter.core.exception.JessieException; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; import java.util.Set; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/core/validation/PackageNameValidator.java b/src/main/java/org/eclipse/microprofile/starter/core/validation/PackageNameValidator.java index 5347bf16..1282c689 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/validation/PackageNameValidator.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/validation/PackageNameValidator.java @@ -22,7 +22,7 @@ */ package org.eclipse.microprofile.starter.core.validation; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.util.regex.Pattern; @ApplicationScoped diff --git a/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandler.java b/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandler.java index 64475961..67db5b29 100644 --- a/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandler.java +++ b/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandler.java @@ -19,14 +19,14 @@ */ package org.eclipse.microprofile.starter.exception; -import javax.faces.FacesException; -import javax.faces.application.FacesMessage; -import javax.faces.application.ViewExpiredException; -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerWrapper; -import javax.faces.context.FacesContext; -import javax.faces.event.ExceptionQueuedEvent; -import javax.faces.event.ExceptionQueuedEventContext; +import jakarta.faces.FacesException; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.application.ViewExpiredException; +import jakarta.faces.context.ExceptionHandler; +import jakarta.faces.context.ExceptionHandlerWrapper; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.ExceptionQueuedEvent; +import jakarta.faces.event.ExceptionQueuedEventContext; import java.util.Iterator; public class CustomExceptionHandler extends ExceptionHandlerWrapper { diff --git a/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandlerFactory.java b/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandlerFactory.java index 4a5232c1..e2513872 100644 --- a/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandlerFactory.java +++ b/src/main/java/org/eclipse/microprofile/starter/exception/CustomExceptionHandlerFactory.java @@ -19,8 +19,8 @@ */ package org.eclipse.microprofile.starter.exception; -import javax.faces.context.ExceptionHandler; -import javax.faces.context.ExceptionHandlerFactory; +import jakarta.faces.context.ExceptionHandler; +import jakarta.faces.context.ExceptionHandlerFactory; public class CustomExceptionHandlerFactory extends ExceptionHandlerFactory { diff --git a/src/main/java/org/eclipse/microprofile/starter/log/DynamoDBLogger.java b/src/main/java/org/eclipse/microprofile/starter/log/DynamoDBLogger.java index 80d494a1..8be06c18 100644 --- a/src/main/java/org/eclipse/microprofile/starter/log/DynamoDBLogger.java +++ b/src/main/java/org/eclipse/microprofile/starter/log/DynamoDBLogger.java @@ -23,7 +23,7 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/org/eclipse/microprofile/starter/log/ErrorLogger.java b/src/main/java/org/eclipse/microprofile/starter/log/ErrorLogger.java index f5495d55..38b45ce3 100644 --- a/src/main/java/org/eclipse/microprofile/starter/log/ErrorLogger.java +++ b/src/main/java/org/eclipse/microprofile/starter/log/ErrorLogger.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.microprofile.starter.core.model.JessieModel; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/org/eclipse/microprofile/starter/log/LoggingTask.java b/src/main/java/org/eclipse/microprofile/starter/log/LoggingTask.java index b3568df6..bfce1bea 100644 --- a/src/main/java/org/eclipse/microprofile/starter/log/LoggingTask.java +++ b/src/main/java/org/eclipse/microprofile/starter/log/LoggingTask.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.starter.view.EngineData; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; public class LoggingTask implements Runnable { diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/API.java b/src/main/java/org/eclipse/microprofile/starter/rest/API.java index 213c5121..e24e6250 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/API.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/API.java @@ -19,8 +19,8 @@ */ package org.eclipse.microprofile.starter.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * @author Michal Karm Babacek diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointLatest.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointLatest.java index b1fb4b5d..8f0d4dbd 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointLatest.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointLatest.java @@ -25,18 +25,18 @@ import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; import org.eclipse.microprofile.starter.rest.model.Project; -import javax.inject.Inject; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV1.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV1.java index 2485fe18..401c4486 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV1.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV1.java @@ -24,17 +24,17 @@ import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; import org.eclipse.microprofile.starter.rest.model.Project; -import javax.inject.Inject; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV2.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV2.java index 27d28d46..524abfce 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV2.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV2.java @@ -24,17 +24,17 @@ import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; import org.eclipse.microprofile.starter.rest.model.Project; -import javax.inject.Inject; -import javax.validation.constraints.NotNull; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV3.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV3.java index b7f5a00a..331f81d9 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV3.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV3.java @@ -23,14 +23,14 @@ import org.eclipse.microprofile.starter.core.model.JavaSEVersion; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV4.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV4.java index c19bb2b0..28753343 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV4.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV4.java @@ -23,14 +23,14 @@ import org.eclipse.microprofile.starter.core.model.JavaSEVersion; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV5.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV5.java index a202cb49..a7d0528d 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV5.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV5.java @@ -23,14 +23,14 @@ import org.eclipse.microprofile.starter.core.model.JavaSEVersion; import org.eclipse.microprofile.starter.core.model.MicroProfileVersion; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV6.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV6.java index fcb0512f..69e05945 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV6.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV6.java @@ -19,7 +19,7 @@ */ package org.eclipse.microprofile.starter.rest; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; /** * diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java index 854d1e7a..16a07963 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java @@ -1,6 +1,6 @@ package org.eclipse.microprofile.starter.rest; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/7") public class APIEndpointV7 extends APIEndpointLatest { diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java index 836db5f2..8d000f9d 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIService.java @@ -47,14 +47,14 @@ import org.eclipse.microprofile.starter.rest.model.ServerOptionsV5; import org.eclipse.microprofile.starter.view.EngineData; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.enterprise.concurrent.ManagedExecutorService; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.core.EntityTag; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.enterprise.concurrent.ManagedExecutorService; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.EntityTag; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/model/MPOptionsAvailable.java b/src/main/java/org/eclipse/microprofile/starter/rest/model/MPOptionsAvailable.java index 3d65ca47..2ad31f0c 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/model/MPOptionsAvailable.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/model/MPOptionsAvailable.java @@ -23,8 +23,8 @@ import org.eclipse.microprofile.starter.addon.microprofile.servers.model.StandaloneMPSpec; import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer; -import javax.json.bind.annotation.JsonbProperty; -import javax.json.bind.annotation.JsonbTransient; +import jakarta.json.bind.annotation.JsonbProperty; +import jakarta.json.bind.annotation.JsonbTransient; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/org/eclipse/microprofile/starter/spi/AbstractAddon.java b/src/main/java/org/eclipse/microprofile/starter/spi/AbstractAddon.java index 34c1b66d..e59b6e70 100755 --- a/src/main/java/org/eclipse/microprofile/starter/spi/AbstractAddon.java +++ b/src/main/java/org/eclipse/microprofile/starter/spi/AbstractAddon.java @@ -29,7 +29,7 @@ import org.eclipse.microprofile.starter.core.model.JessieModel; import org.eclipse.microprofile.starter.core.model.OptionValue; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.Map; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/spi/MavenHelper.java b/src/main/java/org/eclipse/microprofile/starter/spi/MavenHelper.java index fb5991d0..2c55dc50 100755 --- a/src/main/java/org/eclipse/microprofile/starter/spi/MavenHelper.java +++ b/src/main/java/org/eclipse/microprofile/starter/spi/MavenHelper.java @@ -28,7 +28,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.eclipse.microprofile.starter.StarterUnexpectedException; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/eclipse/microprofile/starter/validation/PackageValidator.java b/src/main/java/org/eclipse/microprofile/starter/validation/PackageValidator.java index 8f562d47..77b08d9a 100755 --- a/src/main/java/org/eclipse/microprofile/starter/validation/PackageValidator.java +++ b/src/main/java/org/eclipse/microprofile/starter/validation/PackageValidator.java @@ -24,16 +24,16 @@ import org.eclipse.microprofile.starter.core.validation.PackageNameValidator; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.CDI; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.component.html.HtmlInputText; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.html.HtmlInputText; +import jakarta.faces.context.FacesContext; +import jakarta.faces.validator.FacesValidator; +import jakarta.faces.validator.Validator; +import jakarta.faces.validator.ValidatorException; @FacesValidator("packageNameValidator") public class PackageValidator implements Validator { @@ -59,7 +59,7 @@ public void validate(FacesContext facesContext, UIComponent uiComponent, Object * @param classType a {@link java.lang.Class} representing the required type * @param Generic Type argument * @return CDI instance matching the class type and qualifiers (if specified). - * @throws javax.enterprise.inject.AmbiguousResolutionException When more then 1 bean is found in the match + * @throws jakarta.enterprise.inject.AmbiguousResolutionException When more then 1 bean is found in the match * @throws UnsatisfiedResolutionException When no bean is found in the match. */ public static T retrieveInstance(Class classType) { diff --git a/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java b/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java index 0e7b8ab3..3971fd18 100755 --- a/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java +++ b/src/main/java/org/eclipse/microprofile/starter/view/GeneratorDataBean.java @@ -45,16 +45,16 @@ import org.eclipse.microprofile.starter.log.ErrorLogger; import org.eclipse.microprofile.starter.log.LoggingTask; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.enterprise.concurrent.ManagedExecutorService; -import javax.faces.application.FacesMessage; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.model.SelectItem; -import javax.faces.view.ViewScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.enterprise.concurrent.ManagedExecutorService; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.model.SelectItem; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; diff --git a/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java b/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java index 7453a83b..10bf2af7 100644 --- a/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java +++ b/src/main/java/org/eclipse/microprofile/starter/view/HeaderFilter.java @@ -19,14 +19,14 @@ */ package org.eclipse.microprofile.starter.view; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/src/main/java/org/eclipse/microprofile/starter/view/renderer/CustomSelectManyCheckboxRenderer.java b/src/main/java/org/eclipse/microprofile/starter/view/renderer/CustomSelectManyCheckboxRenderer.java index 4198a215..fc487992 100644 --- a/src/main/java/org/eclipse/microprofile/starter/view/renderer/CustomSelectManyCheckboxRenderer.java +++ b/src/main/java/org/eclipse/microprofile/starter/view/renderer/CustomSelectManyCheckboxRenderer.java @@ -26,11 +26,11 @@ import org.primefaces.util.ComponentUtils; import org.primefaces.util.WidgetBuilder; -import javax.faces.component.UIComponent; -import javax.faces.component.UINamingContainer; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.model.SelectItem; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UINamingContainer; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.model.SelectItem; import java.io.IOException; import java.util.UUID; diff --git a/src/main/resources/files/web.xml.tpl b/src/main/resources/files/web.xml.tpl index e4df47ea..c80e8911 100755 --- a/src/main/resources/files/web.xml.tpl +++ b/src/main/resources/files/web.xml.tpl @@ -4,17 +4,17 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL + jakarta.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL true - javax.faces.SKIP_COMMENTS + jakarta.faces.SKIP_COMMENTS true Faces Servlet - javax.faces.webapp.FacesServlet + jakarta.faces.webapp.FacesServlet 1 diff --git a/src/main/resources/pom-servers.xml b/src/main/resources/pom-servers.xml index 6274e3e2..ba2a3d39 100755 --- a/src/main/resources/pom-servers.xml +++ b/src/main/resources/pom-servers.xml @@ -99,7 +99,7 @@ - org.jboss.spec.javax.ws.rs + org.jboss.spec.jakarta.ws.rs jboss-jaxrs-api_2.0_spec 1.0.1.Final provided @@ -127,48 +127,6 @@ - - - thorntail-v2 - - - - - io.thorntail - bom-all - ${version.thorntail} - import - pom - - - - - - - - io.thorntail - microprofile - - - - - - - io.thorntail - thorntail-maven-plugin - ${version.thorntail} - - - - package - - - - - - - - quarkus @@ -396,8 +354,8 @@ 2.0.4.Final - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api 1.2.0 @@ -423,8 +381,8 @@ true - javax.activation - javax.activation-api + jakarta.activation + jakarta.activation-api runtime diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 0fc3e306..5beb8512 100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -53,7 +53,7 @@ Faces Servlet - javax.faces.webapp.FacesServlet + jakarta.faces.webapp.FacesServlet 1 diff --git a/starter-static-example/css/jq-ui-styles.css b/starter-static-example/css/jq-ui-styles.css index 7322b122..eaa9761f 100644 --- a/starter-static-example/css/jq-ui-styles.css +++ b/starter-static-example/css/jq-ui-styles.css @@ -43,15 +43,15 @@ .ui-icon { width: 16px; height: 16px; - background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/javax.faces.resource/images/ui-icons_222222_256x240.png.xhtml?ln=primefaces-omega) + background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/jakarta.faces.resource/images/ui-icons_222222_256x240.png.xhtml?ln=primefaces-omega) } .ui-widget-content .ui-icon { - background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/javax.faces.resource/images/ui-icons_222222_256x240.png.xhtml?ln=primefaces-omega) + background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/jakarta.faces.resource/images/ui-icons_222222_256x240.png.xhtml?ln=primefaces-omega) } .ui-state-default .ui-icon { - background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/javax.faces.resource/images/ui-icons_454545_256x240.png.xhtml?ln=primefaces-omega) + background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/jakarta.faces.resource/images/ui-icons_454545_256x240.png.xhtml?ln=primefaces-omega) } .ui-icon-triangle-1-s { @@ -89,7 +89,7 @@ } .ui-button .ui-icon { - background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/javax.faces.resource/images/ui-icons_ffffff_256x240.png.xhtml?ln=primefaces-omega) + background-image: url(http://mp-starter-jessie.1d35.starter-us-east-1.openshiftapps.com/mp-starter/jakarta.faces.resource/images/ui-icons_ffffff_256x240.png.xhtml?ln=primefaces-omega) } .ui-button { diff --git a/starter-static-example/index.html b/starter-static-example/index.html index c135ae73..ace3be2a 100644 --- a/starter-static-example/index.html +++ b/starter-static-example/index.html @@ -440,7 +440,7 @@

Project Options

- + diff --git a/starter-static-example/js/primeFaces.js b/starter-static-example/js/primeFaces.js index 109153ab..32f36be7 100644 --- a/starter-static-example/js/primeFaces.js +++ b/starter-static-example/js/primeFaces.js @@ -1,6 +1,6 @@ -(function(a){if(a.PrimeFaces){a.PrimeFaces.debug("PrimeFaces already loaded, ignoring duplicate execution.");return}var b={escapeClientId:function(c){return"#"+c.replace(/:/g,"\\:")},cleanWatermarks:function(){$.watermark.hideAll()},showWatermarks:function(){$.watermark.showAll()},getWidgetById:function(e){for(var d in b.widgets){var c=b.widgets[d];if(c&&c.id===e){return c}}return null},addSubmitParam:function(d,f){var e=$(this.escapeClientId(d));for(var c in f){e.append('')}return this},submit:function(f,e){var c=$(this.escapeClientId(f));var d;if(e){d=c.attr("target");c.attr("target",e)}c.submit();c.children("input.ui-submit-param").remove();if(e){if(d!==undefined){c.attr("target",d)}else{c.removeAttr("target")}}},onPost:function(){this.nonAjaxPosted=true;this.abortXHRs()},abortXHRs:function(){b.ajax.Queue.abortAll()},attachBehaviors:function(d,c){$.each(c,function(f,e){d.bind(f,function(g){e.call(d,g)})})},getCookie:function(c){return $.cookie(c)},setCookie:function(d,e,c){$.cookie(d,e,c)},deleteCookie:function(d,c){$.removeCookie(d,c)},cookiesEnabled:function(){var c=(navigator.cookieEnabled)?true:false;if(typeof navigator.cookieEnabled==="undefined"&&!c){document.cookie="testcookie";c=(document.cookie.indexOf("testcookie")!==-1)?true:false}return(c)},skinInput:function(c){c.hover(function(){$(this).addClass("ui-state-hover")},function(){$(this).removeClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus")}).blur(function(){$(this).removeClass("ui-state-focus")});c.attr("role","textbox").attr("aria-disabled",c.is(":disabled")).attr("aria-readonly",c.prop("readonly"));if(c.is("textarea")){c.attr("aria-multiline",true)}return this},skinButton:function(c){c.mouseover(function(){var e=$(this);if(!c.prop("disabled")){e.addClass("ui-state-hover")}}).mouseout(function(){$(this).removeClass("ui-state-active ui-state-hover")}).mousedown(function(){var e=$(this);if(!c.prop("disabled")){e.addClass("ui-state-active").removeClass("ui-state-hover")}}).mouseup(function(){$(this).removeClass("ui-state-active").addClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus")}).blur(function(){$(this).removeClass("ui-state-focus ui-state-active")}).keydown(function(f){if(f.which===$.ui.keyCode.SPACE||f.which===$.ui.keyCode.ENTER||f.which===$.ui.keyCode.NUMPAD_ENTER){$(this).addClass("ui-state-active")}}).keyup(function(){$(this).removeClass("ui-state-active")});var d=c.attr("role");if(!d){c.attr("role","button")}c.attr("aria-disabled",c.prop("disabled"));return this},skinSelect:function(c){c.mouseover(function(){var d=$(this);if(!d.hasClass("ui-state-focus")){d.addClass("ui-state-hover")}}).mouseout(function(){$(this).removeClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus").removeClass("ui-state-hover")}).blur(function(){$(this).removeClass("ui-state-focus ui-state-hover")});return this},isIE:function(c){return b.env.isIE(c)},info:function(c){if(this.logger){this.logger.info(c)}},debug:function(c){if(this.logger){this.logger.debug(c)}},warn:function(c){if(this.logger){this.logger.warn(c)}if(b.isDevelopmentProjectStage()&&a.console){console.log(c)}},error:function(c){if(this.logger){this.logger.error(c)}if(b.isDevelopmentProjectStage()&&a.console){console.log(c)}},isDevelopmentProjectStage:function(){return b.settings.projectStage==="Development"},setCaretToEnd:function(d){if(d){d.focus();var e=d.value.length;if(e>0){if(d.setSelectionRange){d.setSelectionRange(0,e)}else{if(d.createTextRange){var c=d.createTextRange();c.collapse(true);c.moveEnd("character",1);c.moveStart("character",1);c.select()}}}}},changeTheme:function(g){if(g&&g!==""){var h=$('link[href*="'+b.RESOURCE_IDENTIFIER+'/theme.css"]');if(h.length===0){h=$('link[href*="'+b.RESOURCE_IDENTIFIER+'=theme.css"]')}var f=h.attr("href"),e=f.split("&")[0],d=e.split("ln=")[1],c=f.replace(d,"primefaces-"+g);h.attr("href",c)}},escapeRegExp:function(c){return this.escapeHTML(c.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1"))},escapeHTML:function(c){return c.replace(/&/g,"&").replace(//g,">")},clearSelection:function(){if(a.getSelection){if(a.getSelection().empty){a.getSelection().empty()}else{if(a.getSelection().removeAllRanges&&a.getSelection().rangeCount>0&&a.getSelection().getRangeAt(0).getClientRects().length>0){a.getSelection().removeAllRanges()}}}else{if(document.selection&&document.selection.empty){try{document.selection.empty()}catch(c){}}}},getSelection:function(){var c="";if(a.getSelection){c=a.getSelection()}else{if(document.getSelection){c=document.getSelection()}else{if(document.selection){c=document.selection.createRange().text}}}return c},hasSelection:function(){return this.getSelection().length>0},cw:function(d,e,c){this.createWidget(d,e,c)},createWidget:function(d,f,c){c.widgetVar=f;if(this.widget[d]){var e=this.widgets[f];if(e&&(e.constructor===this.widget[d])){e.refresh(c)}else{this.widgets[f]=new this.widget[d](c);if(this.settings.legacyWidgetNamespace){a[f]=this.widgets[f]}}}else{b.error("Widget not available: "+d)}},getFacesResource:function(f,e,c){if(f.indexOf("/")===0){f=f.substring(1,f.length)}var d=$('script[src*="/'+b.RESOURCE_IDENTIFIER+'/core.js"]').attr("src");if(!d){d=$('script[src*="'+b.RESOURCE_IDENTIFIER+'=core.js"]').attr("src")}d=d.replace("core.js",f);d=d.replace("ln=primefaces","ln="+e);if(c){var h=new RegExp("[?&]v=([^&]*)").exec(d)[1];d=d.replace("v="+h,"v="+c)}var g=a.location.protocol+"//"+a.location.host;return d.indexOf(g)>=0?d:g+d},inArray:function(c,e){for(var d=0;de){d.scrollTop(c+h-e+i)}}},calculateScrollbarWidth:function(){if(!this.scrollbarWidth){if(b.env.browser.msie){var e=$('').css({position:"absolute",top:-1000,left:-1000}).appendTo("body"),d=$('').css({position:"absolute",top:-1000,left:-1000}).appendTo("body");this.scrollbarWidth=e.width()-d.width();e.add(d).remove()}else{var c=$("
").css({width:100,height:100,overflow:"auto",position:"absolute",top:-1000,left:-1000}).prependTo("body").append("
").find("div").css({width:"100%",height:200});this.scrollbarWidth=100-c.width();c.parent().remove()}}return this.scrollbarWidth},bcn:function(d,e,g){if(g){for(var c=0;c=0;d--){var c=this.deferredRenders[d];if(c.widget===e){this.deferredRenders.splice(d,1)}}},invokeDeferredRenders:function(c){var g=[];for(var f=0;f')}return this},submit:function(f,e){var c=$(this.escapeClientId(f));var d;if(e){d=c.attr("target");c.attr("target",e)}c.submit();c.children("input.ui-submit-param").remove();if(e){if(d!==undefined){c.attr("target",d)}else{c.removeAttr("target")}}},onPost:function(){this.nonAjaxPosted=true;this.abortXHRs()},abortXHRs:function(){b.ajax.Queue.abortAll()},attachBehaviors:function(d,c){$.each(c,function(f,e){d.bind(f,function(g){e.call(d,g)})})},getCookie:function(c){return $.cookie(c)},setCookie:function(d,e,c){$.cookie(d,e,c)},deleteCookie:function(d,c){$.removeCookie(d,c)},cookiesEnabled:function(){var c=(navigator.cookieEnabled)?true:false;if(typeof navigator.cookieEnabled==="undefined"&&!c){document.cookie="testcookie";c=(document.cookie.indexOf("testcookie")!==-1)?true:false}return(c)},skinInput:function(c){c.hover(function(){$(this).addClass("ui-state-hover")},function(){$(this).removeClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus")}).blur(function(){$(this).removeClass("ui-state-focus")});c.attr("role","textbox").attr("aria-disabled",c.is(":disabled")).attr("aria-readonly",c.prop("readonly"));if(c.is("textarea")){c.attr("aria-multiline",true)}return this},skinButton:function(c){c.mouseover(function(){var e=$(this);if(!c.prop("disabled")){e.addClass("ui-state-hover")}}).mouseout(function(){$(this).removeClass("ui-state-active ui-state-hover")}).mousedown(function(){var e=$(this);if(!c.prop("disabled")){e.addClass("ui-state-active").removeClass("ui-state-hover")}}).mouseup(function(){$(this).removeClass("ui-state-active").addClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus")}).blur(function(){$(this).removeClass("ui-state-focus ui-state-active")}).keydown(function(f){if(f.which===$.ui.keyCode.SPACE||f.which===$.ui.keyCode.ENTER||f.which===$.ui.keyCode.NUMPAD_ENTER){$(this).addClass("ui-state-active")}}).keyup(function(){$(this).removeClass("ui-state-active")});var d=c.attr("role");if(!d){c.attr("role","button")}c.attr("aria-disabled",c.prop("disabled"));return this},skinSelect:function(c){c.mouseover(function(){var d=$(this);if(!d.hasClass("ui-state-focus")){d.addClass("ui-state-hover")}}).mouseout(function(){$(this).removeClass("ui-state-hover")}).focus(function(){$(this).addClass("ui-state-focus").removeClass("ui-state-hover")}).blur(function(){$(this).removeClass("ui-state-focus ui-state-hover")});return this},isIE:function(c){return b.env.isIE(c)},info:function(c){if(this.logger){this.logger.info(c)}},debug:function(c){if(this.logger){this.logger.debug(c)}},warn:function(c){if(this.logger){this.logger.warn(c)}if(b.isDevelopmentProjectStage()&&a.console){console.log(c)}},error:function(c){if(this.logger){this.logger.error(c)}if(b.isDevelopmentProjectStage()&&a.console){console.log(c)}},isDevelopmentProjectStage:function(){return b.settings.projectStage==="Development"},setCaretToEnd:function(d){if(d){d.focus();var e=d.value.length;if(e>0){if(d.setSelectionRange){d.setSelectionRange(0,e)}else{if(d.createTextRange){var c=d.createTextRange();c.collapse(true);c.moveEnd("character",1);c.moveStart("character",1);c.select()}}}}},changeTheme:function(g){if(g&&g!==""){var h=$('link[href*="'+b.RESOURCE_IDENTIFIER+'/theme.css"]');if(h.length===0){h=$('link[href*="'+b.RESOURCE_IDENTIFIER+'=theme.css"]')}var f=h.attr("href"),e=f.split("&")[0],d=e.split("ln=")[1],c=f.replace(d,"primefaces-"+g);h.attr("href",c)}},escapeRegExp:function(c){return this.escapeHTML(c.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1"))},escapeHTML:function(c){return c.replace(/&/g,"&").replace(//g,">")},clearSelection:function(){if(a.getSelection){if(a.getSelection().empty){a.getSelection().empty()}else{if(a.getSelection().removeAllRanges&&a.getSelection().rangeCount>0&&a.getSelection().getRangeAt(0).getClientRects().length>0){a.getSelection().removeAllRanges()}}}else{if(document.selection&&document.selection.empty){try{document.selection.empty()}catch(c){}}}},getSelection:function(){var c="";if(a.getSelection){c=a.getSelection()}else{if(document.getSelection){c=document.getSelection()}else{if(document.selection){c=document.selection.createRange().text}}}return c},hasSelection:function(){return this.getSelection().length>0},cw:function(d,e,c){this.createWidget(d,e,c)},createWidget:function(d,f,c){c.widgetVar=f;if(this.widget[d]){var e=this.widgets[f];if(e&&(e.constructor===this.widget[d])){e.refresh(c)}else{this.widgets[f]=new this.widget[d](c);if(this.settings.legacyWidgetNamespace){a[f]=this.widgets[f]}}}else{b.error("Widget not available: "+d)}},getFacesResource:function(f,e,c){if(f.indexOf("/")===0){f=f.substring(1,f.length)}var d=$('script[src*="/'+b.RESOURCE_IDENTIFIER+'/core.js"]').attr("src");if(!d){d=$('script[src*="'+b.RESOURCE_IDENTIFIER+'=core.js"]').attr("src")}d=d.replace("core.js",f);d=d.replace("ln=primefaces","ln="+e);if(c){var h=new RegExp("[?&]v=([^&]*)").exec(d)[1];d=d.replace("v="+h,"v="+c)}var g=a.location.protocol+"//"+a.location.host;return d.indexOf(g)>=0?d:g+d},inArray:function(c,e){for(var d=0;de){d.scrollTop(c+h-e+i)}}},calculateScrollbarWidth:function(){if(!this.scrollbarWidth){if(b.env.browser.msie){var e=$('').css({position:"absolute",top:-1000,left:-1000}).appendTo("body"),d=$('').css({position:"absolute",top:-1000,left:-1000}).appendTo("body");this.scrollbarWidth=e.width()-d.width();e.add(d).remove()}else{var c=$("
").css({width:100,height:100,overflow:"auto",position:"absolute",top:-1000,left:-1000}).prependTo("body").append("
").find("div").css({width:"100%",height:200});this.scrollbarWidth=100-c.width();c.parent().remove()}}return this.scrollbarWidth},bcn:function(d,e,g){if(g){for(var c=0;c=0;d--){var c=this.deferredRenders[d];if(c.widget===e){this.deferredRenders.splice(d,1)}}},invokeDeferredRenders:function(c){var g=[];for(var f=0;f=0&&/(rv)(?::| )([\w.]+)/.exec(h)||h.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(h)||[];var f=/(ipad)/.exec(h)||/(iphone)/.exec(h)||/(android)/.exec(h)||/(windows phone)/.exec(h)||/(win)/.exec(h)||/(mac)/.exec(h)||/(linux)/.exec(h)||/(cros)/i.exec(h)||[];return{browser:g[3]||g[1]||"",version:g[2]||"0",platform:f[0]||""}};a=jQuery.uaMatch(window.navigator.userAgent);d={};if(a.browser){d[a.browser]=true;d.version=a.version;d.versionNumber=parseInt(a.version)}if(a.platform){d[a.platform]=true}if(d.android||d.ipad||d.iphone||d["windows phone"]){d.mobile=true}if(d.cros||d.mac||d.linux||d.win){d.desktop=true}if(d.chrome||d.opr||d.safari){d.webkit=true}if(d.rv){var e="msie";a.browser=e;d[e]=true}if(d.opr){var c="opera";a.browser=c;d[c]=true}if(d.safari&&d.android){var b="android";a.browser=b;d[b]=true}d.name=a.browser;d.platform=a.platform;this.browser=d;$.browser=d}},isIE:function(a){return(a===undefined)?this.browser.msie:(this.browser.msie&&parseInt(this.browser.version,10)===a)},isLtIE:function(a){return(this.browser.msie)?parseInt(this.browser.version,10)')}},loadScripts:function(b){var a=function(){var c=b.shift();if(c){PrimeFaces.getScript(c,a)}};a()},getContent:function(c){var b="";for(var a=0;a0){f.val(e)}else{c.append('')}}}},updateHead:function(d){var b=$.ajaxSetup()["cache"];$.ajaxSetup()["cache"]=true;var a=new RegExp("]*>","gi").exec(d)[0];var c=d.indexOf(a)+a.length;$("head").html(d.substring(c,d.lastIndexOf("")));$.ajaxSetup()["cache"]=b},updateBody:function(b){var c=new RegExp("]*>","gi").exec(b)[0];var a=b.indexOf(c)+c.length;$("body").html(b.substring(a,b.lastIndexOf("")))},updateElement:function(d,b,c){if(d.indexOf(PrimeFaces.VIEW_STATE)!==-1){PrimeFaces.ajax.Utils.updateFormStateInput(PrimeFaces.VIEW_STATE,b,c)}else{if(d.indexOf(PrimeFaces.CLIENT_WINDOW)!==-1){PrimeFaces.ajax.Utils.updateFormStateInput(PrimeFaces.CLIENT_WINDOW,b,c)}else{if(d===PrimeFaces.VIEW_ROOT){var a=PrimeFaces.ajax.Utils;window.PrimeFaces=null;a.updateHead(b);a.updateBody(b)}else{if(d===PrimeFaces.ajax.VIEW_HEAD){PrimeFaces.ajax.Utils.updateHead(b)}else{if(d===PrimeFaces.ajax.VIEW_BODY){PrimeFaces.ajax.Utils.updateBody(b)}else{if(d===PrimeFaces.ajax.RESOURCE){$("head").append(b)}else{if(d===$("head")[0].id){PrimeFaces.ajax.Utils.updateHead(b)}else{$(PrimeFaces.escapeClientId(d)).replaceWith(b)}}}}}}}}},Queue:{delays:{},requests:new Array(),xhrs:new Array(),offer:function(a){if(a.delay){var b=null,d=this,b=(typeof(a.source)==="string")?a.source:$(a.source).attr("id"),c=function(){return setTimeout(function(){d.requests.push(a);if(d.requests.length===1){PrimeFaces.ajax.Request.send(a)}},a.delay)};if(this.delays[b]){clearTimeout(this.delays[b].timeout);this.delays[b].timeout=c()}else{this.delays[b]={timeout:c()}}}else{this.requests.push(a);if(this.requests.length===1){PrimeFaces.ajax.Request.send(a)}}},poll:function(){if(this.isEmpty()){return null}var b=this.requests.shift(),a=this.peek();if(a){PrimeFaces.ajax.Request.send(a)}return b},peek:function(){if(this.isEmpty()){return null}return this.requests[0]},isEmpty:function(){return this.requests.length===0},addXHR:function(a){this.xhrs.push(a)},removeXHR:function(b){var a=$.inArray(b,this.xhrs);if(a>-1){this.xhrs.splice(a,1)}},abortAll:function(){for(var a=0;a0){v='form[id*="'+u+'"]';w=s.val()}PrimeFaces.debug("URL to post "+w+".");PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_REQUEST_PARAM,true,u);PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_SOURCE_PARAM,f,u);if(e.resetValues){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.RESET_VALUES_PARAM,true,u)}if(e.ignoreAutoUpdate){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.IGNORE_AUTO_UPDATE_PARAM,true,u)}if(e.skipChildren===false){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.SKIP_CHILDREN_PARAM,false,u)}var r=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"process");if(e.fragmentId){r.push(e.fragmentId)}var a="@none";if(r.length>0){a=r.join(" ")}else{var j=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"process");j=$.trim(j);if(j===""){a="@all"}}if(a!=="@none"){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_PROCESS_PARAM,a,u)}var d=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"update");if(e.fragmentId&&e.fragmentUpdate){d.push(e.fragmentId)}if(d.length>0){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_UPDATE_PARAM,d.join(" "),u)}if(e.event){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.BEHAVIOR_EVENT_PARAM,e.event,u);var l=e.event;if(e.event==="valueChange"){l="change"}else{if(e.event==="action"){l="click"}}PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_EVENT_PARAM,l,u)}else{PrimeFaces.ajax.Request.addParam(g,f,f,u)}if(e.params){PrimeFaces.ajax.Request.addParams(g,e.params,u)}if(e.ext&&e.ext.params){PrimeFaces.ajax.Request.addParams(g,e.ext.params,u)}if(e.partialSubmit&&a.indexOf("@all")===-1){var n=false,h=e.partialSubmitFilter||":input";if(a.indexOf("@none")===-1){for(var o=0;o0){var d=a.val();PrimeFaces.ajax.Request.addParam(e,b,d,f)}},extractParameterNamespace:function(c){var a=c.children("input[name*='"+PrimeFaces.VIEW_STATE+"']");if(a&&a.length>0){var b=a[0].name;if(b.length>PrimeFaces.VIEW_STATE.length){return b.substring(0,b.indexOf(PrimeFaces.VIEW_STATE))}}return null}},Response:{handle:function(h,e,m,b){var n=h.getElementsByTagName("partial-response")[0];for(var g=0;g0&&c.is("input")&&$.isFunction($.fn.getSelection)){f=c.getSelection()}for(var d=0;d')}},loadScripts:function(b){var a=function(){var c=b.shift();if(c){PrimeFaces.getScript(c,a)}};a()},getContent:function(c){var b="";for(var a=0;a0){f.val(e)}else{c.append('')}}}},updateHead:function(d){var b=$.ajaxSetup()["cache"];$.ajaxSetup()["cache"]=true;var a=new RegExp("]*>","gi").exec(d)[0];var c=d.indexOf(a)+a.length;$("head").html(d.substring(c,d.lastIndexOf("")));$.ajaxSetup()["cache"]=b},updateBody:function(b){var c=new RegExp("]*>","gi").exec(b)[0];var a=b.indexOf(c)+c.length;$("body").html(b.substring(a,b.lastIndexOf("")))},updateElement:function(d,b,c){if(d.indexOf(PrimeFaces.VIEW_STATE)!==-1){PrimeFaces.ajax.Utils.updateFormStateInput(PrimeFaces.VIEW_STATE,b,c)}else{if(d.indexOf(PrimeFaces.CLIENT_WINDOW)!==-1){PrimeFaces.ajax.Utils.updateFormStateInput(PrimeFaces.CLIENT_WINDOW,b,c)}else{if(d===PrimeFaces.VIEW_ROOT){var a=PrimeFaces.ajax.Utils;window.PrimeFaces=null;a.updateHead(b);a.updateBody(b)}else{if(d===PrimeFaces.ajax.VIEW_HEAD){PrimeFaces.ajax.Utils.updateHead(b)}else{if(d===PrimeFaces.ajax.VIEW_BODY){PrimeFaces.ajax.Utils.updateBody(b)}else{if(d===PrimeFaces.ajax.RESOURCE){$("head").append(b)}else{if(d===$("head")[0].id){PrimeFaces.ajax.Utils.updateHead(b)}else{$(PrimeFaces.escapeClientId(d)).replaceWith(b)}}}}}}}}},Queue:{delays:{},requests:new Array(),xhrs:new Array(),offer:function(a){if(a.delay){var b=null,d=this,b=(typeof(a.source)==="string")?a.source:$(a.source).attr("id"),c=function(){return setTimeout(function(){d.requests.push(a);if(d.requests.length===1){PrimeFaces.ajax.Request.send(a)}},a.delay)};if(this.delays[b]){clearTimeout(this.delays[b].timeout);this.delays[b].timeout=c()}else{this.delays[b]={timeout:c()}}}else{this.requests.push(a);if(this.requests.length===1){PrimeFaces.ajax.Request.send(a)}}},poll:function(){if(this.isEmpty()){return null}var b=this.requests.shift(),a=this.peek();if(a){PrimeFaces.ajax.Request.send(a)}return b},peek:function(){if(this.isEmpty()){return null}return this.requests[0]},isEmpty:function(){return this.requests.length===0},addXHR:function(a){this.xhrs.push(a)},removeXHR:function(b){var a=$.inArray(b,this.xhrs);if(a>-1){this.xhrs.splice(a,1)}},abortAll:function(){for(var a=0;a0){v='form[id*="'+u+'"]';w=s.val()}PrimeFaces.debug("URL to post "+w+".");PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_REQUEST_PARAM,true,u);PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_SOURCE_PARAM,f,u);if(e.resetValues){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.RESET_VALUES_PARAM,true,u)}if(e.ignoreAutoUpdate){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.IGNORE_AUTO_UPDATE_PARAM,true,u)}if(e.skipChildren===false){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.SKIP_CHILDREN_PARAM,false,u)}var r=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"process");if(e.fragmentId){r.push(e.fragmentId)}var a="@none";if(r.length>0){a=r.join(" ")}else{var j=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"process");j=$.trim(j);if(j===""){a="@all"}}if(a!=="@none"){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_PROCESS_PARAM,a,u)}var d=PrimeFaces.ajax.Request.resolveComponentsForAjaxCall(e,"update");if(e.fragmentId&&e.fragmentUpdate){d.push(e.fragmentId)}if(d.length>0){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_UPDATE_PARAM,d.join(" "),u)}if(e.event){PrimeFaces.ajax.Request.addParam(g,PrimeFaces.BEHAVIOR_EVENT_PARAM,e.event,u);var l=e.event;if(e.event==="valueChange"){l="change"}else{if(e.event==="action"){l="click"}}PrimeFaces.ajax.Request.addParam(g,PrimeFaces.PARTIAL_EVENT_PARAM,l,u)}else{PrimeFaces.ajax.Request.addParam(g,f,f,u)}if(e.params){PrimeFaces.ajax.Request.addParams(g,e.params,u)}if(e.ext&&e.ext.params){PrimeFaces.ajax.Request.addParams(g,e.ext.params,u)}if(e.partialSubmit&&a.indexOf("@all")===-1){var n=false,h=e.partialSubmitFilter||":input";if(a.indexOf("@none")===-1){for(var o=0;o0){var d=a.val();PrimeFaces.ajax.Request.addParam(e,b,d,f)}},extractParameterNamespace:function(c){var a=c.children("input[name*='"+PrimeFaces.VIEW_STATE+"']");if(a&&a.length>0){var b=a[0].name;if(b.length>PrimeFaces.VIEW_STATE.length){return b.substring(0,b.indexOf(PrimeFaces.VIEW_STATE))}}return null}},Response:{handle:function(h,e,m,b){var n=h.getElementsByTagName("partial-response")[0];for(var g=0;g0&&c.is("input")&&$.isFunction($.fn.getSelection)){f=c.getSelection()}for(var d=0;d0){if(g=="@none"||g=="@all"){continue}if(g.indexOf("@")==-1){e=e.add($(document.getElementById(g)))}else{if(g.indexOf("@widgetVar(")==0){var f=g.substring(11,g.length-1);var d=PrimeFaces.widgets[f];if(d){e=e.add($(document.getElementById(d.id)))}else{PrimeFaces.error('Widget for widgetVar "'+f+'" not avaiable')}}else{if(g.indexOf("@(")==0){e=e.add($(g.substring(2,g.length-1)))}}}}}}return e},resolveComponents:function(l){var k=PrimeFaces.expressions.SearchExpressionFacade.splitExpressions(l),c=[];if(k){for(var g=0;g0){if(m.indexOf("@")==-1||m=="@none"||m=="@all"){if(!PrimeFaces.inArray(c,m)){c.push(m)}}else{if(m.indexOf("@widgetVar(")==0){var d=m.substring(11,m.length-1),h=PrimeFaces.widgets[d];if(h){if(!PrimeFaces.inArray(c,h.id)){c.push(h.id)}}else{PrimeFaces.error('Widget for widgetVar "'+d+'" not avaiable')}}else{if(m.indexOf("@(")==0){var b=$(m.substring(2,m.length-1));for(var e=0;e