Skip to content

Commit e226cdf

Browse files
jamesfwoodjamesfwood
committed
Updated to tomcat 11, spring 7, camunda 7.24.6-ee
1 parent 6cba12c commit e226cdf

20 files changed

Lines changed: 68 additions & 64 deletions

File tree

‎.github/workflows/camunda.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146

147147
- name: List CWS Logs
148148
run: |
149-
cd "dist/console-only/cws/server/apache-tomcat-10.1.50/logs"
149+
cd "dist/console-only/cws/server/apache-tomcat-11.0.20/logs"
150150
ls -al
151151
152152
- name: Set up Google Chrome
@@ -182,25 +182,25 @@ jobs:
182182

183183
- name: Show CWS Log for Console
184184
if: always()
185-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
185+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
186186
run: |
187187
cat cws.log
188188
189189
- name: Show Catalina Log for Console
190190
if: always()
191-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
191+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
192192
run: |
193193
cat catalina.out
194194
195195
- name: Show CWS Log for Worker1
196196
if: always()
197-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
197+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
198198
run: |
199199
cat cws.log
200200
201201
- name: Show Catalina Log for Worker1
202202
if: always()
203-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
203+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
204204
run: |
205205
cat catalina.out
206206
@@ -347,7 +347,7 @@ jobs:
347347

348348
- name: List CWS Logs
349349
run: |
350-
cd dist/console-only/cws/server/apache-tomcat-10.1.50/logs
350+
cd dist/console-only/cws/server/apache-tomcat-11.0.20/logs
351351
ls -al
352352
353353
- name: Set up Google Chrome
@@ -372,37 +372,37 @@ jobs:
372372

373373
- name: Show CWS Log for Console
374374
if: always()
375-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
375+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
376376
run: |
377377
cat cws.log
378378
379379
- name: Show Catalina Log for Console
380380
if: always()
381-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
381+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
382382
run: |
383383
cat catalina.out
384384
385385
- name: Show CWS Log for Worker1
386386
if: always()
387-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
387+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
388388
run: |
389389
cat cws.log
390390
391391
- name: Show Catalina Log for Worker1
392392
if: always()
393-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
393+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
394394
run: |
395395
cat catalina.out
396396
397397
- name: Show CWS Log for Worker2
398398
if: always()
399-
working-directory: dist/worker2/cws/server/apache-tomcat-10.1.50/logs
399+
working-directory: dist/worker2/cws/server/apache-tomcat-11.0.20/logs
400400
run: |
401401
cat cws.log
402402
403403
- name: Show Catalina Log for Worker2
404404
if: always()
405-
working-directory: dist/worker2/cws/server/apache-tomcat-10.1.50/logs
405+
working-directory: dist/worker2/cws/server/apache-tomcat-11.0.20/logs
406406
run: |
407407
cat catalina.out
408408

‎.github/workflows/ldap.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
- name: List CWS Logs
124124
run: |
125-
cd dist/console-only/cws/server/apache-tomcat-10.1.50/logs
125+
cd dist/console-only/cws/server/apache-tomcat-11.0.20/logs
126126
ls -al
127127
128128
- name: Set up Google Chrome
@@ -140,25 +140,25 @@ jobs:
140140

141141
- name: Show CWS Log for Console
142142
if: always()
143-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
143+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
144144
run: |
145145
cat cws.log
146146
147147
- name: Show Catalina Log for Console
148148
if: always()
149-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.50/logs
149+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
150150
run: |
151151
cat catalina.out
152152
153153
- name: Show CWS Log for Worker1
154154
if: always()
155-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
155+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
156156
run: |
157157
cat cws.log
158158
159159
- name: Show Catalina Log for Worker1
160160
if: always()
161-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.50/logs
161+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
162162
run: |
163163
cat catalina.out
164164

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
## [Unreleased]
1111
### Added
1212
### Changed
13+
- Updated to Camunda 7.24.6-ee
14+
- Updated to Spring 7
15+
- Updated to Apache Tomcat 11
1316
### Deprecated
1417
### Removed
1518
### Fixed
1619
### Security
20+
### Breaking Changes
21+
- Update Database Schema from Camunda 7.23.0-ee to Camunda 7.24.0-ee:
22+
- Go to the <root-dir>/sql/upgrade/ dir and use the upgrade script:
23+
- mysql_engine_7.23_to_7.24.sql
24+
1725

1826
## [2.8.0]
1927
### Added

‎CLAUDE.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ CWS follows a layered service-oriented architecture with these key modules:
8686
- **cws-test**: Integration and system testing framework
8787

8888
### Key Technologies
89-
- **Spring Framework 6.2.4**: Dependency injection, web services, transactions
90-
- **Camunda BPM 7.23.0-ee**: Workflow engine and BPMN execution
89+
- **Spring Framework 7.0.6**: Dependency injection, web services, transactions
90+
- **Camunda BPM 7.24.6-ee**: Workflow engine and BPMN execution
9191
- **Apache Artemis**: Message queue for external task communication
9292
- **MyBatis**: Database ORM and query mapping
93-
- **Apache Tomcat 10.1.50**: Application server
93+
- **Apache Tomcat 11.0.20**: Application server
9494

9595
### Module Dependencies
9696
```
@@ -118,8 +118,8 @@ cws-core (foundation)
118118

119119
### Version Information
120120
- CWS Version: 2.8.0 (update this each CWS release)
121-
- Camunda Version: 7.24.0-ee
122-
- Tomcat Version: 10.1.50
121+
- Camunda Version: 7.24.6-ee
122+
- Tomcat Version: 11.0.20
123123
- Java Version: 17 (enforced by Maven)
124124

125125
### Security Requirements

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ The CWS image available on Github is loaded with self-signed SSL certs that requ
186186
If you'd like to provide your own SSL certs, you can use the `generate_certs.sh` script in `cws_certs/` to do so. You'll then need to copy those files into the image before startup or (more easily) use volume mounts to make them available to CWS. Take a look at the `docker-compose.yml` file in `install/docker/` -- there are commented-out volume store lines that you can use.
187187

188188
The keystore files CWS looks for are at these paths inside the image:
189-
`/home/cws_user/cws/server/apache-tomcat-10.1.50/conf/.keystore`
190-
`/home/cws_user/cws/server/apache-tomcat-10.1.50/lib/cws_truststore.jks`
189+
`/home/cws_user/cws/server/apache-tomcat-11.0.20/conf/.keystore`
190+
`/home/cws_user/cws/server/apache-tomcat-11.0.20/lib/cws_truststore.jks`
191191

192192
You'll also want to provide CWS with the password you used to create the certs so the software can use them. This is a plaintext file with the password in it. CWS looks for this file at the path: `/root/.cws/creds:ro`. Note that this password is not related to what you'd use to log into the CWS interface -- it's only the password for the certs themselves.
193193

‎cws-core/src/main/java/jpl/cws/core/web/CwsSecurityFilter.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,7 @@ else if (path.startsWith("/cws-ui/") ) {
296296
if (path.startsWith("/cws-ui/fonts/") ||
297297
path.endsWith("login") ||
298298
path.endsWith("not_authorized") ||
299-
//path.toLowerCase().endsWith("/api/authenticate.mvc") ||
300-
path.toLowerCase().endsWith("/api/validatecwstoken.mvc") ||
301-
path.toLowerCase().contains("/api/checksession.mvc")
299+
path.toLowerCase().endsWith("/api/validatecwstoken")
302300
) {
303301
return true; // skip
304302
}
@@ -456,8 +454,8 @@ protected boolean isAuthorized(HttpServletRequest req, String username, String c
456454
if (path.startsWith("/cws-ui/")) {
457455
if (path.endsWith("/home") ||
458456
path.endsWith("/logintotarget") ||
459-
path.endsWith("/api/process-instance/status.mvc") ||
460-
path.endsWith("/cws-ui/api/authenticate.mvc")) {
457+
(path.contains("/api/process-instance/") && path.endsWith("/status")) ||
458+
path.endsWith("/api/authenticate")) {
461459
log.trace("NOT AUTHORIZING CWS PATH: " + path);
462460
return true; // no authorization
463461
}

‎cws-ui/src/main/webapp/WEB-INF/springmvc-servlet.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717

1818
<bean id="swaggerConfig" class="jpl.cws.controller.SwaggerConfig"/>
1919

20-
<mvc:annotation-driven>
21-
<mvc:path-matching suffix-pattern="true" />
22-
</mvc:annotation-driven>
20+
<mvc:annotation-driven/>
21+
<mvc:default-servlet-handler/>
2322

2423
<!-- <bean id="viewResolver"
2524
class="org.springframework.web.servlet.view.InternalResourceViewResolver" >

‎cws-ui/src/main/webapp/WEB-INF/urlrewrite.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
-->
1111
<urlrewrite>
1212

13-
<!-- REWRITE SO THAT SPRING DISPATCH SERVLET WILL FIND *.mvc -->
1413
<rule match-type="wildcard">
1514
<from>/rest/**</from>
16-
<to>/api/$1.mvc</to>
15+
<to>/api/$1</to>
1716
</rule>
1817

1918
</urlrewrite>

‎cws-ui/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<url-pattern>/v3/api-docs/*</url-pattern>
8181
<url-pattern>/swagger-ui</url-pattern>
8282
<url-pattern>/swagger-ui/*</url-pattern>
83-
<url-pattern>*.mvc</url-pattern>
83+
<url-pattern>/*</url-pattern>
8484
</servlet-mapping>
8585

8686
<!-- Webapp context definitions -->

‎dependency-compatibility.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### **Java Version Requirements**
44
- **Minimum**: Java 17
55
- **Current**: Java 17
6-
- **Reason**: Required for Spring Framework 6.x and modern libraries
6+
- **Reason**: Required for Spring Framework 7.x and modern libraries
77

88
### **Maven Version Requirements**
99
- **Minimum**: Maven 3.9.6
@@ -16,8 +16,8 @@
1616

1717
| Library | Current Version | Compatible Versions | Notes |
1818
|---------|----------------|-------------------|-------|
19-
| **Spring Framework** | 6.2.4 | 6.2.x, 6.3.x | ✅ Stable |
20-
| **Camunda BPM** | 7.23.0-ee | 7.23.x | ✅ Enterprise |
19+
| **Spring Framework** | 7.0.6 | 7.0.x | ✅ Stable |
20+
| **Camunda BPM** | 7.24.6-ee | 7.24.x | ✅ Enterprise |
2121
| **Java** | 17 | 17, 21 | ✅ LTS |
2222

2323
### **Testing Dependencies**
@@ -39,8 +39,8 @@
3939
1. **JUnit**: 4.13.2 → 5.12.2 (Complete rewrite)
4040

4141
### **Enterprise Considerations**
42-
1. **Camunda**: 7.23.0-ee (Enterprise license required)
43-
2. **Spring**: 6.2.4 (Stable, well-tested)
42+
1. **Camunda**: 7.24.6-ee (Enterprise license required)
43+
2. **Spring**: 7.0.6 (Stable, well-tested)
4444

4545
## 🛠️ **Tools for Compatibility Checking**
4646

0 commit comments

Comments
 (0)