Skip to content

FISH-12635 payara-samples resync with main branch#8172

Open
astoica1 wants to merge 183 commits into
payara:FISH-12635-Rework-Payara-Samplesfrom
astoica1:FISH-12635-Resync
Open

FISH-12635 payara-samples resync with main branch#8172
astoica1 wants to merge 183 commits into
payara:FISH-12635-Rework-Payara-Samplesfrom
astoica1:FISH-12635-Resync

Conversation

@astoica1

Copy link
Copy Markdown
Contributor

FISH-12635 resync with main branch

abdulrahim458 and others added 30 commits March 23, 2026 19:07
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Bumps `smallrye-common.version` from 2.17.0 to 2.17.1.

Updates `io.smallrye.common:smallrye-common-annotation` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/smallrye/smallrye-common/releases)
- [Commits](smallrye/smallrye-common@2.17.0...2.17.1)

Updates `io.smallrye.common:smallrye-common-expression` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/smallrye/smallrye-common/releases)
- [Commits](smallrye/smallrye-common@2.17.0...2.17.1)

Updates `io.smallrye.common:smallrye-common-function` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/smallrye/smallrye-common/releases)
- [Commits](smallrye/smallrye-common@2.17.0...2.17.1)

Updates `io.smallrye.common:smallrye-common-constraint` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/smallrye/smallrye-common/releases)
- [Commits](smallrye/smallrye-common@2.17.0...2.17.1)

Updates `io.smallrye.common:smallrye-common-classloader` from 2.17.0 to 2.17.1
- [Release notes](https://github.com/smallrye/smallrye-common/releases)
- [Commits](smallrye/smallrye-common@2.17.0...2.17.1)

---
updated-dependencies:
- dependency-name: io.smallrye.common:smallrye-common-annotation
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.smallrye.common:smallrye-common-expression
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.smallrye.common:smallrye-common-function
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.smallrye.common:smallrye-common-constraint
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.smallrye.common:smallrye-common-classloader
  dependency-version: 2.17.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Downgrading to B13 fixes the persistence TCK, but breaks the JAX-WS TCK

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Bumps org.apache.ant:ant-apache-regexp from 1.10.16 to 1.10.17.

---
updated-dependencies:
- dependency-name: org.apache.ant:ant-apache-regexp
  dependency-version: 1.10.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.glassfish.build:command-security-maven-plugin](https://github.com/eclipse-ee4j/glassfish-security-plugin) from 1.0.20 to 1.0.21.
- [Release notes](https://github.com/eclipse-ee4j/glassfish-security-plugin/releases)
- [Commits](eclipse-ee4j/glassfish-security-plugin@1.0.20...1.0.21)

---
updated-dependencies:
- dependency-name: org.glassfish.build:command-security-maven-plugin
  dependency-version: 1.0.21
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps `ant.version` from 1.10.16 to 1.10.17.

Updates `org.apache.ant:ant` from 1.10.16 to 1.10.17

Updates `org.apache.ant:ant-launcher` from 1.10.16 to 1.10.17

---
updated-dependencies:
- dependency-name: org.apache.ant:ant
  dependency-version: 1.10.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.ant:ant-launcher
  dependency-version: 1.10.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps org.apache.ant:ant-junit from 1.10.16 to 1.10.17.

---
updated-dependencies:
- dependency-name: org.apache.ant:ant-junit
  dependency-version: 1.10.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…clipseLink-to-B11

FISH-13351 Downgrade Eclipselink to B11
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
…-PRs-as-Failures-On-Unstable

FISH-13275: when a stage is unstable don't fail the whole build.
The "processing" messages are now finer, and the "executing" & "deleting" messages are now fine

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
…lrye-common.version-2.17.1

FISH-13357 Bump smallrye-common.version from 2.17.0 to 2.17.1
…apache.ant-ant-apache-regexp-1.10.17

FISH-13362 Bump org.apache.ant:ant-apache-regexp from 1.10.16 to 1.10.17
…version-1.10.17

FISH-13360 Bump ant.version from 1.10.16 to 1.10.17
…apache.ant-ant-junit-1.10.17

FISH-13359 Bump org.apache.ant:ant-junit from 1.10.16 to 1.10.17
…glassfish.build-command-security-maven-plugin-1.0.21

FISH-13361 Bump org.glassfish.build:command-security-maven-plugin from 1.0.20 to 1.0.21
Pandrex247 and others added 10 commits May 7, 2026 12:44
…ons-io-commons-io-2.22.0

FISH-13477 Bump commons-io:commons-io from 2.21.0 to 2.22.0
…apache.maven.plugins-maven-invoker-plugin-3.10.0

FISH-13463 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.9.1 to 3.10.0
Bumps org.glassfish.jaxb:codemodel from 4.0.7 to 4.0.8.

---
updated-dependencies:
- dependency-name: org.glassfish.jaxb:codemodel
  dependency-version: 4.0.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps `payara.security-connectors.version` from 4.0.0.Alpha3 to 4.0.0.

Updates `fish.payara.security.connectors:security-connectors-api` from 4.0.0.Alpha3 to 4.0.0
- [Release notes](https://github.com/payara/ecosystem-security-connectors/releases)
- [Changelog](https://github.com/payara/ecosystem-security-connectors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/payara/ecosystem-security-connectors/commits)

Updates `fish.payara.security.connectors:security-connector-oidc-client` from 4.0.0.Alpha3 to 4.0.0

Updates `fish.payara.security.connectors:security-connector-oauth2-client` from 4.0.0.Alpha3 to 4.0.0

Updates `fish.payara.security.connectors:openid-standalone` from 4.0.0.Alpha3 to 4.0.0
- [Release notes](https://github.com/payara/ecosystem-security-connectors/releases)
- [Changelog](https://github.com/payara/ecosystem-security-connectors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/payara/ecosystem-security-connectors/commits)

---
updated-dependencies:
- dependency-name: fish.payara.security.connectors:security-connectors-api
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: fish.payara.security.connectors:security-connector-oidc-client
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: fish.payara.security.connectors:security-connector-oauth2-client
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: fish.payara.security.connectors:openid-standalone
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps `pfl.version` from 5.1.0 to 5.1.1.

Updates `org.glassfish.pfl:pfl-basic` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/eclipse-ee4j/orb-gmbal-pfl/releases)
- [Commits](eclipse-ee4j/orb-gmbal-pfl@5.1.0...5.1.1)

Updates `org.glassfish.pfl:pfl-dynamic` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/eclipse-ee4j/orb-gmbal-pfl/releases)
- [Commits](eclipse-ee4j/orb-gmbal-pfl@5.1.0...5.1.1)

Updates `org.glassfish.pfl:pfl-basic-tools` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/eclipse-ee4j/orb-gmbal-pfl/releases)
- [Commits](eclipse-ee4j/orb-gmbal-pfl@5.1.0...5.1.1)

Updates `org.glassfish.pfl:pfl-tf` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/eclipse-ee4j/orb-gmbal-pfl/releases)
- [Commits](eclipse-ee4j/orb-gmbal-pfl@5.1.0...5.1.1)

Updates `org.glassfish.pfl:pfl-tf-tools` from 5.1.0 to 5.1.1
- [Release notes](https://github.com/eclipse-ee4j/orb-gmbal-pfl/releases)
- [Commits](eclipse-ee4j/orb-gmbal-pfl@5.1.0...5.1.1)

---
updated-dependencies:
- dependency-name: org.glassfish.pfl:pfl-basic
  dependency-version: 5.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.glassfish.pfl:pfl-dynamic
  dependency-version: 5.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.glassfish.pfl:pfl-basic-tools
  dependency-version: 5.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.glassfish.pfl:pfl-tf
  dependency-version: 5.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.glassfish.pfl:pfl-tf-tools
  dependency-version: 5.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
FISH-13447 Resolve NPE when access log log-to-console is enabled for …
…version-5.1.1

FISH-13521 Bump pfl.version from 5.1.0 to 5.1.1
…ra.security-connectors.version-4.0.0

FISH-13522 Bump payara.security-connectors.version from 4.0.0.Alpha3 to 4.0.0
…glassfish.jaxb-codemodel-4.0.8

FISH-13523 Bump org.glassfish.jaxb:codemodel from 4.0.7 to 4.0.8
# Conflicts:
#	appserver/tests/functional/payara-micro/pom.xml
#	appserver/tests/payara-samples/cleanboot/pom.xml
#	appserver/tests/payara-samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/glassfish-ejb-jar.xml
#	appserver/tests/payara-samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/payara-ejb-jar.xml
#	appserver/tests/payara-samples/clustered-singleton/clustered-singleton-test/src/test/resources/ForFailures/META-INF/glassfish-ejb-jar.xml
#	appserver/tests/payara-samples/clustered-singleton/clustered-singleton-test/src/test/resources/ForFailures/META-INF/payara-ejb-jar.xml
#	appserver/tests/payara-samples/clustered-singleton/pom.xml
#	appserver/tests/payara-samples/concurrency/pom.xml
#	appserver/tests/payara-samples/concurrency/src/main/java/fish/payara/sample/concurrency/annotations/managedexecutor/ManagedExecutorDefinitionEJBFromConfig.java
#	appserver/tests/payara-samples/concurrency/src/main/java/fish/payara/sample/concurrency/annotations/managedscheduledexecutor/ManagedScheduledExecutorEJBFromConfig.java
#	appserver/tests/payara-samples/concurrency/src/main/java/fish/payara/sample/concurrency/annotations/managedthreadfactory/ManagedThreadFactoryEJBFromConfig.java
#	appserver/tests/payara-samples/concurrency/src/test/resources/ejb-jar.xml
#	appserver/tests/payara-samples/concurrency/src/test/resources/ejb-jar2.xml
#	appserver/tests/payara-samples/concurrency/src/test/resources/ejb-jar3.xml
#	appserver/tests/payara-samples/concurrency/src/test/resources/ejb-jar4.xml
#	appserver/tests/payara-samples/corba-read-timeout/pom.xml
#	appserver/tests/payara-samples/custom-loginmodule-realm/pom.xml
#	appserver/tests/payara-samples/data/pom.xml
#	appserver/tests/payara-samples/data/src/main/java/fish/payara/samples/data/repo/TransactionalEmployees.java
#	appserver/tests/payara-samples/data/src/main/java/fish/payara/samples/data/repo/UnsupportedRepo.java
#	appserver/tests/payara-samples/data/src/main/java/fish/payara/samples/data/service/EmployeeService.java
#	appserver/tests/payara-samples/data/src/test/java/fish/payara/samples/data/EjbTransactionRepositoryTests.java
#	appserver/tests/payara-samples/data/src/test/java/fish/payara/samples/data/TransactionEnlistmentTests.java
#	appserver/tests/payara-samples/data/src/test/java/fish/payara/samples/data/TransactionalRepositoryTests.java
#	appserver/tests/payara-samples/data/src/test/java/fish/payara/samples/data/UnsupportedMethodTest.java
#	appserver/tests/payara-samples/dynamic-roles/pom.xml
#	appserver/tests/payara-samples/ejb-http-remoting/pom.xml
#	appserver/tests/payara-samples/formauth/pom.xml
#	appserver/tests/payara-samples/http/pom.xml
#	appserver/tests/payara-samples/jacc-per-app/pom.xml
#	appserver/tests/payara-samples/jaxrs-rolesallowed-servlet/pom.xml
#	appserver/tests/payara-samples/jaxrs-rolesallowed/pom.xml
#	appserver/tests/payara-samples/jaxws-security/pom.xml
#	appserver/tests/payara-samples/jaxws-tracing/pom.xml
#	appserver/tests/payara-samples/legacy-mode-empty-beans-xml/pom.xml
#	appserver/tests/payara-samples/logging/pom.xml
#	appserver/tests/payara-samples/microprofile-endpoints/pom.xml
#	appserver/tests/payara-samples/microprofile-healthcheck/pom.xml
#	appserver/tests/payara-samples/microprofile-jwt-error-cache/pom.xml
#	appserver/tests/payara-samples/microprofile-rc-ft/pom.xml
#	appserver/tests/payara-samples/microprofile-rest-client/pom.xml
#	appserver/tests/payara-samples/mvc/pom.xml
#	appserver/tests/payara-samples/oauth2/pom.xml
#	appserver/tests/payara-samples/openid/pom.xml
#	appserver/tests/payara-samples/opentelemetry/pom.xml
#	appserver/tests/payara-samples/payara-expression-config-properties/pom.xml
#	appserver/tests/payara-samples/realm-identity-stores/pom.xml
#	appserver/tests/payara-samples/remote-ejb-tracing/pom.xml
#	appserver/tests/payara-samples/reproducers/pom.xml
#	appserver/tests/payara-samples/rest-management/pom.xml
#	appserver/tests/payara-samples/rolesPermitted/pom.xml
#	appserver/tests/payara-samples/rolesallowed-unprotected-methods/pom.xml
#	appserver/tests/payara-samples/samples/client-certificate-validator/pom.xml
#	appserver/tests/payara-samples/samples/clustered-singleton/clustered-singleton-test/src/main/webapp/WEB-INF/glassfish-ejb-jar.xml
#	appserver/tests/payara-samples/samples/formauth/pom.xml
#	appserver/tests/payara-samples/samples/microprofile-config/pom.xml
#	appserver/tests/payara-samples/samples/microprofile-endpoints/secure/pom.xml
#	appserver/tests/payara-samples/samples/multiple-keystores/pom.xml
#	appserver/tests/payara-samples/samples/pom.xml
#	appserver/tests/payara-samples/sfsb-passivation/pom.xml
#	appserver/tests/payara-samples/test-domain-setup/pom.xml
#	appserver/tests/payara-samples/use-bundled-jsf-primefaces/pom.xml
#	appserver/tests/payara-samples/versioned-deployment/pom.xml
@astoica1 astoica1 requested a review from Pandrex247 May 20, 2026 03:45
Comment thread appserver/tests/payara-samples/pom.xml
Comment thread appserver/tests/payara-samples/ejb-http-remoting/pom.xml Outdated

@Pandrex247 Pandrex247 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The client certificate tests need rejigging to move to the new antrun style

@astoica1

Copy link
Copy Markdown
Contributor Author

The client certificate tests need rejigging to move to the new antrun style

Addressed in later commits.

@astoica1 astoica1 requested a review from Pandrex247 May 20, 2026 12:48
// .addAsWebInfResource(new File("src/main/webapp/WEB-INF", "payara-web.xml"))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.glassfish:jakarta.faces:" + JSF_VERSION))
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:15.0.4"));
.addAsLibraries(Libraries.resolveMavenCoordinatesToFiles("org.primefaces:primefaces:jar:jakarta:15.0.15"));

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the only file with this version that needs changing
You're also polluting the git history with commits doing the same thing that has already been committed to main

I think you need to redo this with an up-to-date main merge

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your local main seems to be at least a week out of date

@Pandrex247 Pandrex247 May 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no skipServerRestart property anymore - should just be skipConfig or skipTestConfigCleanup

@Pandrex247 Pandrex247 May 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There shouldn't be a payara-server-managed profile anymore.
Just use <target if="payara.server.managed">, <target if="payara.server.remote">, or <target unless="payara.micro.managed"> as appropriate

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A payara-server-remote profile can remain, but should only really be used for post-integration-test phase cleanup

@astoica1 astoica1 added the PR: DO NOT MERGE Don't merge PR until further notice label May 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

PR: DO NOT MERGE Don't merge PR until further notice

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants