Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into feature/#923-add-screenreader-supp…
Browse files Browse the repository at this point in the history
…ort-to-multi-user-input
  • Loading branch information
lehju committed May 27, 2024
2 parents 6477986 + d0e2b60 commit 990c772
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Issues: #xxx
- [ ] Smoketest successful (Manual E2E-Test depending on Change)
- [ ] No waste on Branch left (e.g. `console.logs`)
- [ ] [Board](https://app.zenhub.com/workspaces/digiwf-621f70bf50ea1100120b7e93/board) is up-to-date
- [ ] Internal Services / Artifacts updated (Depending on Change - See Dependency Graph)
- [ ] Internal Services / Artifacts updated (Depending on Change - See [Dependency Graph](https://wiki.muenchen.de/betriebshandbuch/wiki/DigiWF#Abh.C3.A4ngigkeiten)
- [ ] Openshift environments are prepared (Secrets, etc.) and release-issue is maintained
2 changes: 1 addition & 1 deletion .github/workflows/check-compliance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4
# Compliance
- name: Advance Security Policy as Code
uses: advanced-security/[email protected].1
uses: advanced-security/[email protected].3
with:
policy: it-at-m/policy-as-code
policy-path: default.yaml
Expand Down
37 changes: 32 additions & 5 deletions .github/workflows/issue_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,37 @@ jobs:
permissions:
issues: write
steps:
- name: 'Get-Team'
if: github.event.issue.author_association != 'MEMBER'
- name: 'Check Author'
uses: actions/github-script@v7
id: get-team
id: check-author
with:
github-token: ${{ secrets.ACCESS_TOKEN }}
debug: true
script: |
const { owner } = context.repo;
const author = context.payload.sender.login;
const maintainers = await github.rest.teams.listMembersInOrg({
org: owner,
team_slug: 'digiwf_maintainer'
});
const devs = await github.rest.teams.listMembersInOrg({
org: owner,
team_slug: 'digiwf_dev'
});
const admins = await github.rest.teams.listMembersInOrg({
org: owner,
team_slug: 'digiwf_admin'
});
const coreMembers = maintainers.data.concat(devs.data, admins.data).map(u => u.login)
console.log(author)
console.log(coreMembers)
console.log(coreMembers.includes(author))
return coreMembers.includes(author)
- name: 'Assign Issue'
uses: actions/github-script@v7
if: steps.check-author.outputs.result != 'true'
with:
github-token: ${{ secrets.ACCESS_TOKEN }}
debug: true
Expand All @@ -30,9 +57,9 @@ jobs:
issue_number,
assignees: maintainers.data.map(u => u.login)
});
- name: 'Assign Issue'
if: github.event.issue.author_association != 'MEMBER'
- name: 'Inform Author'
uses: actions/github-script@v7
if: steps.check-author.outputs.result != 'true'
with:
debug: true
script: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>add-source</id>
Expand Down
34 changes: 33 additions & 1 deletion digiwf-integrations/digiwf-s3-integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,37 @@ The following steps are needed to run the integration (service and client exampl
2. Execute http test located in `/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/src/main/resources/s3-client.http`
3. Inspect the console of the client


## Additional configuration

If there is no requirement for the use of a message broker and the s3 integration is addressed exclusively via REST, the following settings can be used to deactivate the spring-cloud-stream-feature in a service which uses the `digiwf-s3-integration-starter`.

A hardcoded solution to disable the default behaviour with exclusion of specific auto-configuration classes on start up can be found down below.

```java
...
import org.springframework.cloud.stream.config.BindingServiceConfiguration;
import org.springframework.cloud.stream.function.FunctionConfiguration;
...

/**
* Application class for starting the micro-service.
*/
@SpringBootApplication(
...
// Deactivating the Spring Cloud Stream functionality that is activated by default
exclude = { BindingServiceConfiguration.class, FunctionConfiguration.class },
...
)
```

An alternative to the hard coded solution is to exclude the classes via the following spring property.

```yml
spring:
autoconfigure:
exclude:
# Deactivating the Spring Cloud Stream functionality that is activated by default
- org.springframework.cloud.stream.config.BindingServiceConfiguration
- org.springframework.cloud.stream.function.FunctionConfiguration
```
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-email/digiwf-email-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>

<!-- Testing -->
Expand Down
2 changes: 1 addition & 1 deletion digiwf-libs/digiwf-testing/digiwf-e2e-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
<version>3.5.4</version>
<version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/digiwf-tasklist-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<axon-extension-kafka.version>4.9.0</axon-extension-kafka.version>

<spin.version>1.23.0</spin.version>
<wiremock.version>3.5.4</wiremock.version>
<wiremock.version>3.6.0</wiremock.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion digiwf-task/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<description>Task management used by DigiWF</description>

<properties>
<kotlin.version>1.9.24</kotlin.version>
<kotlin.version>2.0.0</kotlin.version>
<camunda.version>7.20.0</camunda.version>
<polyflow.version>4.1.4</polyflow.version>
<camunda-bpm-data.version>1.5.0</camunda-bpm-data.version>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<plugin>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId>
<version>7.5.0</version>
<version>7.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -236,7 +236,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
Expand Down

0 comments on commit 990c772

Please sign in to comment.