Skip to content

Commit e3db1d7

Browse files
committed
Adjust docs and release process to renamed example projects
(cherry picked from commit 70640db)
1 parent ee257bb commit e3db1d7

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

.github/workflows/release.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,35 +77,35 @@ jobs:
7777
fetch-depth: 1
7878
ref: "refs/tags/${{ env.RELEASE_TAG }}"
7979
path: junit-framework
80-
- name: Check out samples repository
80+
- name: Check out examples repository
8181
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8282
with:
83-
repository: ${{ github.repository_owner }}/junit5-samples
84-
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_SAMPLES_REPO }}
83+
repository: ${{ github.repository_owner }}/junit-examples
84+
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
8585
fetch-depth: 1
86-
path: junit5-samples
86+
path: junit-examples
8787
- name: Set up JDK
8888
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
8989
with:
9090
java-version: 21
9191
distribution: temurin
9292
- uses: sbt/setup-sbt@26ab4b0fa1c47fa62fc1f6e51823a658fb6c760c # v1.1.7
93-
- name: Update JUnit dependencies in samples
93+
- name: Update JUnit dependencies in examples
9494
run: java src/Updater.java ${{ inputs.releaseVersion }}
95-
working-directory: junit5-samples
95+
working-directory: junit-examples
9696
- name: Prepare Maven Central user token
9797
uses: ./junit-framework/.github/actions/maven-central-user-token
9898
with:
9999
username: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
100100
password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
101101
- name: Inject staging repository URL
102102
run: java src/StagingRepoInjector.java ${{ env.STAGING_REPO_URL }}
103-
working-directory: junit5-samples
104-
- name: Build samples
105-
run: java src/Builder.java --exclude=junit5-jupiter-starter-bazel,junit5-jupiter-starter-sbt
106-
working-directory: junit5-samples
103+
working-directory: junit-examples
104+
- name: Build examples
105+
run: java src/Builder.java --exclude=junit-jupiter-starter-bazel,junit-jupiter-starter-sbt
106+
working-directory: junit-examples
107107
env:
108-
MAVEN_ARGS: --settings ${{ github.workspace }}/junit5-samples/src/central-staging-maven-settings.xml --activate-profiles central-staging
108+
MAVEN_ARGS: --settings ${{ github.workspace }}/junit-examples/src/central-staging-maven-settings.xml --activate-profiles central-staging
109109

110110
close_github_milestone:
111111
name: Close GitHub milestone
@@ -231,26 +231,26 @@ jobs:
231231
curl --silent --fail --location --output /tmp/junit-user-guide.pdf "${{ steps.pagesDeployment.outputs.pdfUrl }}"
232232
pdfinfo /tmp/junit-user-guide.pdf
233233
234-
update_samples:
235-
name: Update samples
234+
update_examples:
235+
name: Update examples
236236
needs: publish_deployment
237237
runs-on: ubuntu-latest
238238
steps:
239-
- name: Check out samples repository
239+
- name: Check out examples repository
240240
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
241241
with:
242-
repository: ${{ github.repository_owner }}/junit5-samples
243-
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_SAMPLES_REPO }}
242+
repository: ${{ github.repository_owner }}/junit-examples
243+
token: ${{ secrets.JUNIT_BUILDS_GITHUB_TOKEN_EXAMPLES_REPO }}
244244
fetch-depth: 1
245245
- name: Set up JDK
246246
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
247247
with:
248248
java-version: 21
249249
distribution: temurin
250250
- uses: sbt/setup-sbt@26ab4b0fa1c47fa62fc1f6e51823a658fb6c760c # v1.1.7
251-
- name: Update JUnit dependencies in samples
251+
- name: Update JUnit dependencies in examples
252252
run: java src/Updater.java ${{ inputs.releaseVersion }}
253-
- name: Build samples
253+
- name: Build examples
254254
if: ${{ inputs.dryRun == false }}
255255
run: java src/Builder.java
256256
- name: Create release branch
@@ -274,7 +274,7 @@ jobs:
274274
create_github_release:
275275
name: Create GitHub release
276276
if: ${{ inputs.dryRun == false }}
277-
needs: [ publish_documentation, update_samples ]
277+
needs: [ publish_documentation, update_examples ]
278278
runs-on: ubuntu-latest
279279
permissions:
280280
contents: write

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This repository is the home of _JUnit 5_.
2020
- [User Guide]
2121
- [Javadoc]
2222
- [Release Notes]
23-
- [Samples]
23+
- [Examples]
2424

2525
## Contributing
2626

@@ -102,6 +102,6 @@ of the JUnit Platform, JUnit Jupiter, and JUnit Vintage.
102102
[Javadoc]: https://docs.junit.org/current/api/
103103
[JDK 21]: https://javaalmanac.io/jdk/21/
104104
[Release Notes]: https://docs.junit.org/current/release-notes/
105-
[Samples]: https://github.com/junit-team/junit5-samples
105+
[Examples]: https://github.com/junit-team/junit-examples
106106
[StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
107107
[User Guide]: https://docs.junit.org/current/user-guide/

documentation/src/docs/asciidoc/link-attributes.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@ endif::[]
229229
:EnableRuleMigrationSupport: {javadoc-root}/org.junit.jupiter.migrationsupport/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupport.html[@EnableRuleMigrationSupport]
230230
// Vintage
231231
:junit-vintage-engine: {javadoc-root}/org.junit.vintage.engine/org/junit/vintage/engine/package-summary.html[junit-vintage-engine]
232-
// Samples Repository
233-
:junit5-samples-repo: {junit-team}/junit5-samples
234-
:junit5-jupiter-starter-ant: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-starter-ant[junit5-jupiter-starter-ant]
235-
:junit5-jupiter-starter-gradle-groovy: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-starter-gradle-groovy[junit5-jupiter-starter-gradle-groovy]
236-
:junit5-jupiter-starter-gradle-kotlin: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-starter-gradle-kotlin[junit5-jupiter-starter-gradle-kotlin]
237-
:junit5-jupiter-starter-gradle: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-starter-gradle[junit5-jupiter-starter-gradle]
238-
:junit5-jupiter-starter-maven: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-starter-maven[junit5-jupiter-starter-maven]
239-
:RandomParametersExtension: {junit5-samples-repo}/tree/{release-branch}/junit5-jupiter-extensions/src/main/java/com/example/random/RandomParametersExtension.java[RandomParametersExtension]
232+
// Examples Repository
233+
:junit-examples-repo: {junit-team}/junit-examples
234+
:junit-jupiter-starter-ant: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-starter-ant[junit-jupiter-starter-ant]
235+
:junit-jupiter-starter-gradle-groovy: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-starter-gradle-groovy[junit-jupiter-starter-gradle-groovy]
236+
:junit-jupiter-starter-gradle-kotlin: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-starter-gradle-kotlin[junit-jupiter-starter-gradle-kotlin]
237+
:junit-jupiter-starter-gradle: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-starter-gradle[junit-jupiter-starter-gradle]
238+
:junit-jupiter-starter-maven: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-starter-maven[junit-jupiter-starter-maven]
239+
:RandomParametersExtension: {junit-examples-repo}/tree/{release-branch}/junit-jupiter-extensions/src/main/java/com/example/random/RandomParametersExtension.java[RandomParametersExtension]
240240
// Third-party Links
241241
:API: https://apiguardian-team.github.io/apiguardian/docs/current/api/[@API]
242242
:API_Guardian: https://github.com/apiguardian-team/apiguardian[@API Guardian]

documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Make sure that the `junit-vintage-engine` artifact is in your test runtime path.
2525
case JUnit 3 and JUnit 4 tests will automatically be picked up by the JUnit Platform
2626
launcher.
2727

28-
See the example projects in the {junit5-samples-repo}[`junit5-samples`] repository to
28+
See the example projects in the {junit-examples-repo}[`junit-examples`] repository to
2929
find out how this is done with Gradle and Maven.
3030

3131
[[migrating-from-junit4-categories-support]]

documentation/src/docs/asciidoc/user-guide/overview.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ corresponding sections of this User Guide, organized by topic.
7777
==== Example Projects
7878

7979
To see complete, working examples of projects that you can copy and experiment with, the
80-
{junit5-samples-repo}[`junit5-samples`] repository is a good place to start. The
81-
`junit5-samples` repository hosts a collection of sample projects based on JUnit Jupiter,
80+
{junit-examples-repo}[`junit-examples`] repository is a good place to start. The
81+
`junit-examples` repository hosts a collection of example projects based on JUnit Jupiter,
8282
JUnit Vintage, and other testing frameworks. You'll find appropriate build scripts (e.g.,
8383
`build.gradle`, `pom.xml`, etc.) in the example projects. The links below highlight some
8484
of the combinations you can choose from.
8585

86-
* For Gradle and Java, check out the `{junit5-jupiter-starter-gradle}` project.
87-
* For Gradle and Kotlin, check out the `{junit5-jupiter-starter-gradle-kotlin}` project.
88-
* For Gradle and Groovy, check out the `{junit5-jupiter-starter-gradle-groovy}` project.
89-
* For Maven, check out the `{junit5-jupiter-starter-maven}` project.
90-
* For Ant, check out the `{junit5-jupiter-starter-ant}` project.
86+
* For Gradle and Java, check out the `{junit-jupiter-starter-gradle}` project.
87+
* For Gradle and Kotlin, check out the `{junit-jupiter-starter-gradle-kotlin}` project.
88+
* For Gradle and Groovy, check out the `{junit-jupiter-starter-gradle-groovy}` project.
89+
* For Maven, check out the `{junit-jupiter-starter-maven}` project.
90+
* For Ant, check out the `{junit-jupiter-starter-ant}` project.

0 commit comments

Comments
 (0)