Skip to content

Commit d0bbd43

Browse files
tomwheelertomwheeler
authored
Merge pull request #26 from temporalio/tw-update-libraries
Upgrade SDK and other dependencies, fix problems discovered during testing.
2 parents f723379 + e784dfa commit d0bbd43

File tree

20 files changed

+118
-1459
lines changed

20 files changed

+118
-1459
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
**/target/*
22
.DS_Store
3+
*.pdf

‎README.md‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,6 @@ For the exercises, make sure to run `temporal server start-dev --ui-port 8080 --
1313
| `exercises/farewell-workflow` | [Exercise 3](exercises/farewell-workflow/README.md) |
1414
| `exercises/finale-workflow` | [Exercise 4](exercises/finale-workflow/README.md) |
1515

16-
## GitPod Environment Shortcuts
17-
18-
If you are executing the exercises in the provided GitPod environment, you
19-
can take advantage of certain aliases to aid in navigation.
20-
21-
| Command | Action |
22-
| :------ | :-------------------------------------- |
23-
| `ex1` | Change to Exercise 1 Practice Directory |
24-
| `ex1s` | Change to Exercise 1 Solution Directory |
25-
| `ex2` | Change to Exercise 2 Practice Directory |
26-
| `ex2s` | Change to Exercise 2 Solution Directory |
27-
| `ex3` | Change to Exercise 3 Practice Directory |
28-
| `ex3s` | Change to Exercise 3 Solution Directory |
29-
| `ex4` | Change to Exercise 4 Practice Directory |
30-
| `ex4s` | Change to Exercise 4 Solution Directory |
31-
3216
## Instructor-Led Demonstrations
3317

3418
| Directory Name | Description |

‎demos/service-workflow/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@
2121
<dependency>
2222
<groupId>io.temporal</groupId>
2323
<artifactId>temporal-sdk</artifactId>
24-
<version>1.19.1</version>
24+
<version>1.31.0</version>
2525
</dependency>
2626

2727
<dependency>
2828
<groupId>org.slf4j</groupId>
2929
<artifactId>slf4j-nop</artifactId>
30-
<version>2.0.6</version>
30+
<version>2.0.17</version>
3131
</dependency>
3232

3333
<dependency>
3434
<groupId>org.apache.commons</groupId>
3535
<artifactId>commons-lang3</artifactId>
36-
<version>3.11</version>
36+
<version>3.18.0</version>
3737
</dependency>
3838

3939
<dependency>
4040
<groupId>io.temporal</groupId>
4141
<artifactId>temporal-testing</artifactId>
42-
<version>1.19.1</version>
42+
<version>1.31.0</version>
4343
<scope>test</scope>
4444
</dependency>
4545

4646
<dependency>
4747
<groupId>junit</groupId>
4848
<artifactId>junit</artifactId>
49-
<version>4.11</version>
49+
<version>4.13.2</version>
5050
<scope>test</scope>
5151
</dependency>
5252

5353
<dependency>
5454
<groupId>org.mockito</groupId>
5555
<artifactId>mockito-core</artifactId>
56-
<version>5.1.1</version>
56+
<version>5.14.2</version>
5757
<scope>test</scope>
5858
</dependency>
5959

‎demos/writing-a-workflow-definition/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<maven.compiler.source>1.7</maven.compiler.source>
17-
<maven.compiler.target>1.7</maven.compiler.target>
16+
<maven.compiler.source>1.8</maven.compiler.source>
17+
<maven.compiler.target>1.8</maven.compiler.target>
1818
</properties>
1919

2020
<dependencies>

‎demos/writing-a-workflow-definition/src/main/java/workflowdefinition/Greeting.java‎ renamed to ‎demos/writing-a-workflow-definition/src/main/java/io/temporal/learn/Greeting.java‎

File renamed without changes.

‎demos/writing-a-workflow-definition/src/main/java/workflowdefinition/GreetingImpl.java‎ renamed to ‎demos/writing-a-workflow-definition/src/main/java/io/temporal/learn/GreetingImpl.java‎

File renamed without changes.

‎demos/writing-a-workflow-definition/src/main/java/workflowdefinition/Starter.java‎ renamed to ‎demos/writing-a-workflow-definition/src/main/java/io/temporal/learn/Starter.java‎

File renamed without changes.

‎exercises/farewell-workflow/README.md‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,6 @@ you'll need to change. If you get stuck and need additional hints, or
1313
if you want to check your work, look at the completed example in the
1414
`solution` directory.
1515

16-
## GitPod Environment Shortcuts
17-
18-
If you are executing the exercises in the provided GitPod environment, you
19-
can take advantage of certain aliases to aid in navigation and execution of
20-
the code.
21-
22-
| Command | Action |
23-
| :---------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------- |
24-
| `ex3` | Change to Exercise 3 Practice Directory |
25-
| `ex3s` | Change to Exercise 3 Solution Directory |
26-
| `ex3m` | Execute the Exercise 3 Microservice. Must be within the appropriate directory for this to succeed. (either `practice` or `solution`) |
27-
| `ex3w` | Execute the Exercise 3 Worker. Must be within the appropriate directory for this to succeed. (either `practice` or `solution`) |
28-
| `ex3st YOUR_NAME` | Execute the Exercise 3 Starter, passing in your name. Must be within the appropriate directory for this to succeed. (either `practice` or `solution`) |
29-
3016
## Part A: Write an Activity Method
3117

3218
The `GreetingActivities.java` file defines an interface with the Activity method signatures.
@@ -65,12 +51,9 @@ before executing the following commands:
6551

6652
1. Compile the code using the command `mvn clean compile`
6753
2. Start the microservice by running `mvn exec:java -Dexec.mainClass="farewellworkflow.Microservice"` in a terminal
68-
1. **Note:** If you're using GitPod, you can run the shortcut `ex3m`
6954
3. In another terminal, start your Worker by running `mvn exec:java -Dexec.mainClass="farewellworkflow.GreetingWorker"`
70-
1. **Note:** If you're using GitPod, you can run the shortcut `ex3w`
7155
4. In a third terminal, execute your Workflow by running `mvn exec:java -Dexec.mainClass="farewellworkflow.Starter" -Dexec.args="Mason"`
7256
(replacing `Mason` with your own name)
73-
1. **Note:** If you're using GitPod, you can run the shortcut `ex3st Mason` (replacing `Mason` with your own name)
7457

7558
If there is time remaining, experiment with Activity failures and retries
7659
by stopping the microservice (press Ctrl-C in its terminal) and re-running

‎exercises/farewell-workflow/practice/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,39 @@
2222
<dependency>
2323
<groupId>io.temporal</groupId>
2424
<artifactId>temporal-sdk</artifactId>
25-
<version>1.19.1</version>
25+
<version>1.31.0</version>
2626
</dependency>
2727

2828
<dependency>
2929
<groupId>org.slf4j</groupId>
3030
<artifactId>slf4j-nop</artifactId>
31-
<version>2.0.6</version>
31+
<version>2.0.17</version>
3232
</dependency>
3333

3434
<dependency>
3535
<groupId>org.apache.commons</groupId>
3636
<artifactId>commons-lang3</artifactId>
37-
<version>3.11</version>
37+
<version>3.18.0</version>
3838
</dependency>
3939

4040
<dependency>
4141
<groupId>io.temporal</groupId>
4242
<artifactId>temporal-testing</artifactId>
43-
<version>1.19.1</version>
43+
<version>1.31.0</version>
4444
<scope>test</scope>
4545
</dependency>
4646

4747
<dependency>
4848
<groupId>junit</groupId>
4949
<artifactId>junit</artifactId>
50-
<version>4.11</version>
50+
<version>4.13.2</version>
5151
<scope>test</scope>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>org.mockito</groupId>
5656
<artifactId>mockito-core</artifactId>
57-
<version>5.1.1</version>
57+
<version>5.14.2</version>
5858
<scope>test</scope>
5959
</dependency>
6060

‎exercises/farewell-workflow/solution/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,39 +22,39 @@
2222
<dependency>
2323
<groupId>io.temporal</groupId>
2424
<artifactId>temporal-sdk</artifactId>
25-
<version>1.19.1</version>
25+
<version>1.31.0</version>
2626
</dependency>
2727

2828
<dependency>
2929
<groupId>org.slf4j</groupId>
3030
<artifactId>slf4j-nop</artifactId>
31-
<version>2.0.6</version>
31+
<version>2.0.17</version>
3232
</dependency>
3333

3434
<dependency>
3535
<groupId>org.apache.commons</groupId>
3636
<artifactId>commons-lang3</artifactId>
37-
<version>3.11</version>
37+
<version>3.18.0</version>
3838
</dependency>
3939

4040
<dependency>
4141
<groupId>io.temporal</groupId>
4242
<artifactId>temporal-testing</artifactId>
43-
<version>1.19.1</version>
43+
<version>1.31.0</version>
4444
<scope>test</scope>
4545
</dependency>
4646

4747
<dependency>
4848
<groupId>junit</groupId>
4949
<artifactId>junit</artifactId>
50-
<version>4.11</version>
50+
<version>4.13.2</version>
5151
<scope>test</scope>
5252
</dependency>
5353

5454
<dependency>
5555
<groupId>org.mockito</groupId>
5656
<artifactId>mockito-core</artifactId>
57-
<version>5.1.1</version>
57+
<version>5.14.2</version>
5858
<scope>test</scope>
5959
</dependency>
6060

0 commit comments

Comments
 (0)