_Bastler/we.bstly-back
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

update dependencies, fix minetest dep

Browse Source
This commit is contained in:
_Bastler 2024-03-28 11:11:49 +01:00
parent bcb235d9ea
commit 77270cf917
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/de/bstly/we/businesslogic/PermissionManager.java
View File

@ -8,8 +8,6 @@ import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -33,8 +31,6 @@ import de.bstly.we.repository.PermissionRepository;
@Component @Component
public class PermissionManager implements UserDataProvider { public class PermissionManager implements UserDataProvider {
private Logger logger = LoggerFactory.getLogger(PermissionManager.class);
@Autowired @Autowired
private PermissionRepository permissionRepository; private PermissionRepository permissionRepository;
@Autowired @Autowired
@ -437,7 +433,7 @@ public class PermissionManager implements UserDataProvider {
permission = new Permission(); permission = new Permission();
permission.setTarget(target); permission.setTarget(target);
permission.setName(name); permission.setName(name);
permission.setAddon(permissionMapping.isAddon()); permission.setAddon(permissionMapping.isAddon()); // TODO: check for ROLE_MEMBER
permission.setStarts(permissionStarts); permission.setStarts(permissionStarts);
permission.setExpires(permissionsExpires); permission.setExpires(permissionsExpires);
} else { } else {

8
minetest/pom.xml
View File

@ -17,5 +17,13 @@
<artifactId>webstly-core</artifactId> <artifactId>webstly-core</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- Query DSL -->
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
<classifier>jakarta</classifier>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
pom.xml
View File

@ -14,13 +14,13 @@
<java.version>17</java.version> <java.version>17</java.version>
<querydsl.version>5.0.0</querydsl.version> <querydsl.version>5.0.0</querydsl.version>
<nimbus.version>9.37.3</nimbus.version> <nimbus.version>9.37.3</nimbus.version>
<revision>3.0.5-SNAPSHOT</revision> <revision>3.0.6-SNAPSHOT</revision>
</properties> </properties>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.0</version> <version>3.2.4</version>
<relativePath /> <relativePath />
</parent> </parent>