Skip to content

Commit 13c438d

Browse files
committed
Merge branch 'master' into develop
2 parents 527ee12 + fa4ede5 commit 13c438d

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/sonar-java.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ on:
77
# paths: [ 'quartz-manager-parent/**' ]
88
pull_request:
99
types: [opened, synchronize, reopened]
10-
1110
jobs:
1211
build:
1312
name: Build and analyze
1413
runs-on: ubuntu-latest
1514
steps:
16-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1716
with:
1817
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v1
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v3
2120
with:
22-
java-version: 11
21+
java-version: 17
22+
distribution: 'zulu' # Alternative distribution options are available.
2323
- name: Cache SonarCloud packages
24-
uses: actions/cache@v1
24+
uses: actions/cache@v3
2525
with:
2626
path: ~/.sonar/cache
2727
key: ${{ runner.os }}-sonar
2828
restore-keys: ${{ runner.os }}-sonar
2929
- name: Cache Maven packages
30-
uses: actions/cache@v1
30+
uses: actions/cache@v3
3131
with:
3232
path: ~/.m2
3333
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

quartz-manager-parent/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ Replace the dummy job (class: `it.fabioformosa.quartzmanager.jobs.SampleJob`) wi
5858

5959
**Backend Stack** Java 9, Spring Boot 2.5.6 (Spring MVC 5.3.12, Spring Security 5.5.3), Quartz Scheduler 2.3.2
6060

61-
**Frontend** Angular 9.1.4, Web-Socket (stompjs 2.3.3)
61+
**Frontend** Angular 14.2.12, Web-Socket (stompjs 2.3.3)
6262

63-
**Style** Angular Material 9, FontAwesome 5
63+
**Style** Angular Material 14, FontAwesome 5
6464

6565
Starting from Quartz Manager v2.x.x, the new structure of project is:
6666
* Multi-module maven project: REST API backend
67-
* Angular 9: Single Page Application frontend
67+
* Angular 14: Single Page Application frontend
6868

6969
(The first version of quartz manager was a monolithic backend that provided also frontend developed with angularjs 1.6.x. You can find it at the branch 1.x.x)
7070

quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public SchedulerFactoryBean schedulerFactoryBean(@Qualifier("quartzJobFactory")
5555
if (quartzProperties != null && quartzProperties.size() > 0)
5656
mergedProperties.putAll(quartzProperties);
5757
factory.setQuartzProperties(mergedProperties);
58-
factory.setAutoStartup(false);
58+
boolean isAutoStartup = mergedProperties.getProperty("org.quartz.scheduler.isAutoStartup") != null && mergedProperties.getProperty("org.quartz.scheduler.isAutoStartup").equals("true");
59+
factory.setAutoStartup(isAutoStartup);
5960
return factory;
6061
}
6162
}

0 commit comments

Comments
 (0)