Skip to content

Commit

Permalink
Work for 1.1.0 (#411)
Browse files Browse the repository at this point in the history 
* Streams implementation
* Dependencies update
* Bug fixes
---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nван <90376473+1BAH@users.noreply.github.com>
Co-authored-by: Alex286756 <125192905+Alex286756@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@inponomarev @1BAH
@Alex286756 @dependabot
4 people authored Jan 20, 2024
1 parent e13b9a0 commit 48d4d10
Show file tree
Hide file tree
Showing 54 changed files with 4,117 additions and 316 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: build

on:
push:
branches: [master]
branches:
- master
pull_request:
branches: [master]
branches:
- master

jobs:
build:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/native-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,8 @@ jobs:
if: always()
run: ./testnative unit/type/zset
working-directory: native_tests

- name: stream
if: always()
run: ./testnative unit/type/stream
working-directory: native_tests
194 changes: 97 additions & 97 deletions native_tests/jm-test-server/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,97 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.fppt</groupId>
<artifactId>jm-test-server</artifactId>
<version>1.0-SNAPSHOT</version>

<packaging>jar</packaging>

<properties>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.9.0</junit.version>
<assertj.core.version>3.23.1</assertj.core.version>
<approvaltests.version>18.2.2</approvaltests.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
<jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
<checkstyle.maven.plugin.version>3.2.0</checkstyle.maven.plugin.version>
<checkstyle.version>10.3.3</checkstyle.version>
</properties>

<dependencies>
<dependency>
<groupId>com.github.fppt</groupId>
<artifactId>jedis-mock</artifactId>
<version>${jedismock.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.5</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>

<configuration>
<archive>
<manifest>
<mainClass>com.github.fppt.jedismock.InterceptorMockServer</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>

</configuration>

<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.maven.plugin.version}</version>
<executions>
<execution>
<id>verify-style</id>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.fppt</groupId>
<artifactId>jm-test-server</artifactId>
<version>1.0-SNAPSHOT</version>

<packaging>jar</packaging>

<properties>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.9.0</junit.version>
<assertj.core.version>3.23.1</assertj.core.version>
<approvaltests.version>18.2.2</approvaltests.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
<jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
<checkstyle.maven.plugin.version>3.2.0</checkstyle.maven.plugin.version>
<checkstyle.version>10.3.3</checkstyle.version>
</properties>

<dependencies>
<dependency>
<groupId>com.github.fppt</groupId>
<artifactId>jedis-mock</artifactId>
<version>${jedismock.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.4.5</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>

<configuration>
<archive>
<manifest>
<mainClass>com.github.fppt.jedismock.InterceptorMockServer</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>

</configuration>

<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.maven.plugin.version}</version>
<executions>
<execution>
<id>verify-style</id>
<phase>process-classes</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit 48d4d10

Please sign in to comment.