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

chore(deps): step2 - Java17 / Pact 4.6.5 #26

Merged
merged 74 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
a0ff4ae
Step 3 - Add consumer Pact tests
pendsley Apr 12, 2021
e7ff9a4
Step 4 - Add Pact Provider tests
Oct 9, 2020
385590b
Step 5 - Update consumer application with correct path and re-run ver…
Oct 9, 2020
878eb37
Step 6 - Add more test cases to pacts
Oct 9, 2020
4ab0c02
Step 7 - Implement provider states
Oct 9, 2020
1b1e5a5
Step 8 - Update consumer pact to require authorization
Oct 9, 2020
6be48e5
Merge pull request #3 from pendsley/step3
uglyog Apr 12, 2021
c26f610
Merge pull request #4 from pendsley/step4
uglyog Apr 12, 2021
0db579b
Merge pull request #5 from pendsley/step5
uglyog Apr 12, 2021
e2751cf
Merge pull request #6 from pendsley/step6
uglyog Apr 12, 2021
2f06276
Merge pull request #7 from pendsley/step7
uglyog Apr 12, 2021
e2babbe
Merge pull request #8 from pendsley/step8
uglyog Apr 12, 2021
830ee2e
chore: make build scripts executable
Sep 15, 2021
9db8978
chore: make build scripts executable
Sep 15, 2021
6d510f0
chore: make build scripts executable
Sep 15, 2021
b2fbf0c
chore: make build scripts executable
Sep 15, 2021
01cce9f
chore: make build scripts executable
Sep 15, 2021
b092056
chore: make build scripts executable
Sep 15, 2021
4ebbd5d
chore: fix step 8 readme
Sep 15, 2021
8f1896a
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
3058457
chore: make build scripts executable
Sep 15, 2021
b4d0071
chore: update to support JDK 8 + add outline
Sep 16, 2021
6da5174
chore: support JDK 8
Sep 16, 2021
4f2d35d
chore: update to support JDK 8
Sep 16, 2021
898c18f
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
09f3693
chore: make build scripts executable
Sep 15, 2021
785108a
chore: update to support JDK 8 + add outline
Sep 16, 2021
aea6710
chore: support JDK 8
Sep 16, 2021
8f49cf7
chore: update to support JDK 8
Sep 16, 2021
a88a4bb
chore: update readme
Sep 16, 2021
62209d3
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
dc6a39a
chore: make build scripts executable
Sep 15, 2021
1735fae
chore: update to support JDK 8 + add outline
Sep 16, 2021
e04245e
chore: support JDK 8
Sep 16, 2021
4a2a1e5
chore: update to support JDK 8
Sep 16, 2021
611e61c
chore: update readme
Sep 16, 2021
a8e84be
chore: update readme
Sep 16, 2021
ec47bd2
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
1367b34
chore: make build scripts executable
Sep 15, 2021
cce6ee4
chore: update to support JDK 8 + add outline
Sep 16, 2021
47546e4
chore: support JDK 8
Sep 16, 2021
3ba169f
chore: update to support JDK 8
Sep 16, 2021
9147cf1
chore: update readme
Sep 16, 2021
1e1a257
chore: update readme
Sep 16, 2021
4ef91f5
chore: update readme
Sep 16, 2021
78a6aab
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
d007995
chore: make build scripts executable
Sep 15, 2021
738bcc6
chore: update to support JDK 8 + add outline
Sep 16, 2021
e45c198
chore: support JDK 8
Sep 16, 2021
85fea16
chore: update to support JDK 8
Sep 16, 2021
7f3e37d
chore: update readme
Sep 16, 2021
e22181b
chore: update readme
Sep 16, 2021
c729655
chore: update readme
Sep 16, 2021
7d822e2
chore: update readme + JDK 8 fix
Sep 16, 2021
6ab8d6c
feat: Step 1 - Add simple consumer calling provider
Oct 8, 2020
82ad1ea
chore: make build scripts executable
Sep 15, 2021
0a6e8c5
chore: update to support JDK 8 + add outline
Sep 16, 2021
d1eb4af
chore: support JDK 8
Sep 16, 2021
d979c4a
chore: update to support JDK 8
Sep 16, 2021
57af277
chore: update readme
Sep 16, 2021
8fd7547
chore: update readme
Sep 16, 2021
edd9f9f
chore: update readme
Sep 16, 2021
4dc48b6
chore: update readme + JDK 8 fix
Sep 16, 2021
879b0be
chore: update readme
Sep 16, 2021
90d5805
chore: update readme
Sep 16, 2021
cae51e3
chore: step8 update
YOU54F Feb 1, 2024
57909a8
chore: rm dep
YOU54F Feb 1, 2024
01f1984
Merge branch 'step8' into step7
YOU54F Feb 1, 2024
a95bdec
Merge branch 'step7' into step6
YOU54F Feb 1, 2024
3132c01
Merge branch 'step6' into step5
YOU54F Feb 1, 2024
21bc9b9
Merge branch 'step5' into step4
YOU54F Feb 1, 2024
252acdc
Merge branch 'step4' into step3
YOU54F Feb 1, 2024
66cfc83
Merge branch 'step3' into step2
YOU54F Feb 1, 2024
4a9fe79
Update build.gradle
YOU54F Feb 1, 2024
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
24 changes: 24 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: CI
on:
push:
branches:
- step2
pull_request:
branches:
- step2
jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'

- name: Test consumer tests
run: ./gradlew consumer:test
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
consumer/.gradle
.gradle
build/
!../gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
consumer/bin
provider/bin

### STS ###
.apt_generated
Expand Down Expand Up @@ -45,3 +47,7 @@ gradle-app.setting

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

## MacOS

.DS_Store
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ step of the workshop just check out the branch for that step (i.e. `git checkout

## Requirements

* JDK 8+
* JDK 17+
* Docker for step 11

## Workshop outline:
Expand Down
10 changes: 6 additions & 4 deletions consumer/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
plugins {
id 'org.springframework.boot' version '2.3.4.RELEASE'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
// Stopped from moving to 3.2.x due to wiremock issue
// https://github.com/wiremock/wiremock/issues/2395
id 'org.springframework.boot' version '3.1.8'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'au.com.dius.pactworkshop'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '8'
sourceCompatibility = '17'

dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
Expand All @@ -14,7 +16,7 @@ dependencies {
testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
}
testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
}

test {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions provider/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'org.springframework.boot' version '2.3.4.RELEASE'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '3.2.2'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'au.com.dius.pactworkshop'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '8'
sourceCompatibility = '17'

dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
Expand Down