zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-1.6' into development

Browse source 
# Conflicts:
#	pom.xml
This commit is contained in:
anhefti 2024-06-24 11:47:40 +02:00
commit 38fb5e06a0
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
pom.xml
View file

@ -70,7 +70,7 @@
<profile> <profile>
<id>let_reporting</id> <id>let_reporting</id>
<properties> <properties>
<java.version>17</java.version> <java.version>1.8</java.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>
@ -79,8 +79,8 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<release>${java.version}</release> <source>1.8</source>
<encoding>UTF-8</encoding> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
@ -89,9 +89,6 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<systemPropertyVariables>
<file.encoding>UTF-8</file.encoding>
</systemPropertyVariables>
</configuration> </configuration>
</plugin> </plugin>
@ -103,6 +100,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.10.0</version>
<configuration> <configuration>
<skipEmptyReport>false</skipEmptyReport> <skipEmptyReport>false</skipEmptyReport>
<failOnViolation>false</failOnViolation> <failOnViolation>false</failOnViolation>
@ -121,6 +119,27 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.4</version>
<configuration>
<effort>Max</effort>
<failOnError>false</failOnError>
<threshold>Low</threshold>
<xmlOutput>true</xmlOutput>
<excludeFilterFile>findbugs-excludes.xml</excludeFilterFile>
</configuration>
<executions>
<execution>
<id>analyze-compile</id>
<phase>compile</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
@ -144,7 +163,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version> <version>0.8.3</version>
<executions> <executions>
<execution> <execution>
<id>prepare-agent</id> <id>prepare-agent</id>
@ -348,18 +367,13 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>1.10.0</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.vladimir-bukhtoyarov</groupId> <groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-core</artifactId> <artifactId>bucket4j-core</artifactId>
<version>4.10.0</version> <version>4.10.0</version>
</dependency> </dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- Testing --> <!-- Testing -->

2
src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java
View file

@ -321,7 +321,7 @@ public class EntityTable<ROW extends ModelIdAware> {
this.sortOrder = this.defaultSortOrder; this.sortOrder = this.defaultSortOrder;
updateSortUserAttr(); updateSortUserAttr();
setTableSort(); setTableSort();
applyFilter(); this.selectPage(1);
} }
public void updateCurrentPage() { public void updateCurrentPage() {