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.

Sign up for GitHub

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

V3 fix maven errors #289

Merged
merged 3 commits into from
Jan 22, 2025
Merged

V3 fix maven errors #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a1ce9
fix pom.xml
gchickma Jan 17, 2025
e943467
update java version in Dockerfile to eclipse-temurin:17-jdk-alpine
gchickma Jan 17, 2025
3dea760
Resolved web security related error
chummar-paily Jan 22, 2025
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11.0.17_8-jdk-alpine
FROM eclipse-temurin:17-jdk-alpine
ARG BMRG_TAG
ENV JAVA_OPTS=""
ENV BMRG_HOME=/opt/boomerang
Expand Down
16 changes: 10 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,15 @@
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>com.github.alturkovic</groupId>
<artifactId>distributed-lock</artifactId>
<version>2.1.0</version>
<groupId>com.github.alturkovic</groupId>
<artifactId>distributed-lock</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>io.cloudevents</groupId>
<artifactId>cloudevents-api</artifactId>
<version>1.3.0</version>
</dependency>

<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
Expand Down Expand Up @@ -292,6 +291,11 @@
<artifactId>slack-app-backend</artifactId>
<version>1.44.2</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>2.1.7</version>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -355,8 +359,8 @@

<repositories>
<repository>
<id>github</id>
<url>https://maven.pkg.github.com/boomerang-io/*</url>
<id>boomeranglib-maven</id>
<url>https://tools.boomerangplatform.net/artifactory/boomeranglib-maven</url>
</repository>
<repository>
<id>jitpack.io</id>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/boomerang/security/config/WebSecurity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ public class WebSecurity {
public SecurityFilterChain configure(HttpSecurity http) throws Exception {

if (boomerangAuthorization) {
setupJWT(http);
return setupJWT(http);
} else {
setupNone(http);
return setupNone(http);
}
return setupNone(http);

}

Expand All @@ -79,7 +79,7 @@ public SecurityFilterChain setupJWT(HttpSecurity http)
authenticationManager(http.getSharedObject(AuthenticationConfiguration.class)), flowUserService,
flowSettingsService, basicPassword);

return http.csrf(AbstractHttpConfigurer::disable)
return http.csrf(csrf -> csrf.disable())
.authorizeHttpRequests(
auth -> auth.requestMatchers(HEALTH, API_DOCS, INFO, INTERNAL, WEBJARS, SLACK_INSTALL).permitAll())
.authorizeHttpRequests(request -> {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/boomerang/service/crud/WorkflowVersionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down
Loading