Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WFLY-16599] Convert the elytron-oidc-client testsuite to the jakarta* namespace. #15804

Merged
merged 1 commit into from Jul 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 22 additions & 4 deletions testsuite/integration/elytron-oidc-client/pom.xml
Expand Up @@ -46,12 +46,25 @@
<jbossas.ts.dir>${jbossas.ts.integ.dir}/..</jbossas.ts.dir>
<jbossas.project.dir>${jbossas.ts.dir}/..</jbossas.project.dir>
<surefire.forked.process.timeout>3600</surefire.forked.process.timeout>
<wildfly.build.output.dir>build/target/${server.output.dir.prefix}-${server.output.dir.version}</wildfly.build.output.dir>
<!-- properties to enable plugins shared by various bootable jar executions -->
<bootable-jar-packaging.phase>none</bootable-jar-packaging.phase>
<!-- Use the WildFly Preview dependencies until standard WildFly moves to EE 10 -->
<dependency.management.import.artifact>wildfly-ee-9-parent</dependency.management.import.artifact>
<wildfly-testsuite-shared.artifactId>wildfly-testsuite-shared-jakarta</wildfly-testsuite-shared.artifactId>
<wildfly.build.output.dir>ee-9/dist/target/${server.output.dir.prefix}-preview-${server.output.dir.version}</wildfly.build.output.dir>
<testsuite.ee.galleon.pack.artifactId>wildfly-preview-feature-pack</testsuite.ee.galleon.pack.artifactId>
<!-- WildFly Arquillian Adapter with Jakarta EE Support -->
<version.org.jboss.arquillian.core>1.7.0.Alpha10</version.org.jboss.arquillian.core>
<version.org.wildfly.arquillian>5.0.0.Alpha1</version.org.wildfly.arquillian>
<arquillian.servlet.protocol>Servlet 5.0</arquillian.servlet.protocol>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
Expand Down Expand Up @@ -97,6 +110,11 @@
<artifactId>jsoup</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-testsuite-shared</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-elytron-oidc-client-subsystem</artifactId>
Expand Down Expand Up @@ -274,9 +292,9 @@
</plugin-options>
<feature-packs>
<feature-pack>
<groupId>${full.maven.groupId}</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${full.maven.version}</version>
<groupId>${testsuite.ee.galleon.pack.groupId}</groupId>
<artifactId>${testsuite.ee.galleon.pack.artifactId}</artifactId>
<version>${testsuite.ee.galleon.pack.version}</version>
<inherit-configs>false</inherit-configs>
<inherit-packages>false</inherit-packages>
</feature-pack>
Expand Down