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

Use versionless feature #198

Open
wants to merge 7 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
canSkip: ${{ steps.Checker.outputs.canSkip }}
steps:
- name: Get files
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Get tools
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: tools/
repository: openliberty/guides-common
Expand Down Expand Up @@ -44,10 +44,11 @@ jobs:
run:
working-directory: finish
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'semeru'
java-version: 11
- run: unset _JAVA_OPTIONS
- name: Run tests
Expand Down
14 changes: 8 additions & 6 deletions finish/src/main/liberty/config/server.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<server description="new server">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
<feature>mpConfig</feature>

<!--Enable the following features to run tests with Arquillian managed container-->
<!-- tag::localConnector[] -->
<feature>localConnector-1.0</feature>
<!-- end::localConnector[] -->
<!-- tag::Servlet[] -->
<feature>servlet-6.0</feature>
<feature>servlet</feature>
<!-- end::Servlet[] -->

</featureManager>
Expand Down
14 changes: 8 additions & 6 deletions start/src/main/liberty/config/server.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<server description="new server">

<featureManager>
<feature>restfulWS-3.1</feature>
<feature>jsonb-3.0</feature>
<feature>jsonp-2.1</feature>
<feature>cdi-4.0</feature>
<feature>mpConfig-3.1</feature>
<platform>jakartaee-10.0</platform>
<platform>microprofile-6.1</platform>
<feature>restfulWS</feature>
<feature>jsonb</feature>
<feature>jsonp</feature>
<feature>cdi</feature>
<feature>mpConfig</feature>

<!-- Enable the following features to run tests with Arquillian managed container -->
<!-- tag::localConnector[] -->
<feature>localConnector-1.0</feature>
<!-- end::localConnector[] -->
<!-- tag::Servlet[] -->
<feature>servlet-6.0</feature>
<feature>servlet</feature>
<!-- end::Servlet[] -->

</featureManager>
Expand Down
Loading