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 features #171

Open
wants to merge 4 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 @@ -13,9 +13,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 @@ -46,10 +46,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: Grant execute permission for gradlew
Expand Down
18 changes: 9 additions & 9 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017, 2023 IBM Corporation and others.
// Copyright (c) 2017, 2025 IBM Corporation and others.
// Licensed under Creative Commons Attribution-NoDerivatives
// 4.0 International (CC BY-ND 4.0)
// https://creativecommons.org/licenses/by-nd/4.0/
Expand Down Expand Up @@ -110,17 +110,17 @@ You should see information about the Gradle installation similar to this example
[source, role="no_copy"]
----
------------------------------------------------------------
Gradle 7.6
Gradle 8.6
------------------------------------------------------------

Build time: 2022-11-25 13:35:10 UTC
Revision: daece9dbc5b79370cc8e4fd6fe4b2cd400e150a8
Build time: 2024-02-02 16:47:16 UTC
Revision: d55c486870a0dc6f6278f53d21381396d0741c6e

Kotlin: 1.7.10
Groovy: 3.0.13
Ant: Apache Ant(TM) version 1.10.11 compiled on July 10 2021
JVM: 11.0.12 (Eclipse OpenJ9 openj9-0.27.0)
OS: Mac OS X 12.6.3 x86_64
Kotlin: 1.9.20
Groovy: 3.0.17
Ant: Apache Ant(TM) version 1.10.13 compiled on January 4 2023
JVM: 17.0.12 (Eclipse OpenJ9 openj9-0.46.0)
OS: Mac OS X 15.2 aarch64

----

Expand Down
2 changes: 1 addition & 1 deletion finish/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
// provided dependencies
// tag::providedcompile[]
providedCompile 'jakarta.platform:jakarta.jakartaee-api:10.0.0'
providedCompile 'org.eclipse.microprofile:microprofile:6.1'
providedCompile 'org.eclipse.microprofile:microprofile:7.0'
// end::providedcompile[]

// test dependencies
Expand Down
3 changes: 2 additions & 1 deletion finish/src/main/liberty/config/server.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<server description="Sample Servlet server">
<featureManager>
<feature>servlet-6.0</feature>
<platform>jakartaee-10.0</platform>
<feature>servlet</feature>
</featureManager>

<httpEndpoint httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint" host="*" />
Expand Down
5 changes: 5 additions & 0 deletions scripts/testApp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ cat ./build.gradle
./gradlew build -b ./build.gradle -x openBrowser -i
curl http://localhost:9080/GradleSample/servlet | grep Hello
./gradlew libertyStop

sed -i "s;test.finalizedBy(openBrowser);;g" build.gradle
cat build.gradle

./gradlew test
3 changes: 2 additions & 1 deletion start/src/main/liberty/config/server.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<server description="Sample Servlet server">
<featureManager>
<feature>servlet-6.0</feature>
<platform>jakartaee-10.0</platform>
<feature>servlet</feature>
</featureManager>

<httpEndpoint httpPort="${http.port}" httpsPort="${https.port}" id="defaultHttpEndpoint" host="*" />
Expand Down
Loading