Skip to content

Commit

Permalink
#115 ressurect support for legacy Hazelcast version
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimir-bukhtoyarov committed Feb 24, 2020
1 parent 5b494b3 commit f1f82b4
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 12 deletions.
9 changes: 0 additions & 9 deletions bucket4j-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,4 @@
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>lincheck</artifactId>
<version>2.5.3</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
106 changes: 106 additions & 0 deletions lincheck-tests/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?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">
<parent>
<artifactId>bucket4j</artifactId>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<version>5.0.0-alpha-2019-10-18</version>
<relativePath>../bucket4j-parent</relativePath>
</parent>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
<experimentalCoroutines>enable</experimentalCoroutines>
<kotlin.version>1.3.61</kotlin.version>
<lincheck.version>2.5.3</lincheck.version>
</properties>

<modelVersion>4.0.0</modelVersion>

<artifactId>lincheck-tests</artifactId>

<build>
<!-- <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>-->
<!-- <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>-->
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<goals> <goal>compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>test-compile</id>
<goals> <goal>test-compile</goal> </goals>
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<executions>
<!-- Replacing default-compile as it is treated specially by maven -->
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<!-- Replacing default-testCompile as it is treated specially by maven -->
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
<execution>
<id>java-compile</id>
<phase>compile</phase>
<goals> <goal>compile</goal> </goals>
</execution>
<execution>
<id>java-test-compile</id>
<phase>test-compile</phase>
<goals> <goal>testCompile</goal> </goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>lincheck</artifactId>
<version>${lincheck.version}</version>
<scope>test</scope>
</dependency>
</dependencies>


</project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
* limitations under the License.
*/

package io.github.bucket4j.experimental;
package io.github.bucket4j;

import org.jetbrains.annotations.NotNull;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package io.github.bucket4j.experimental;
package io.github.bucket4j;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlinx.lincheck.LinChecker;
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<module>bucket4j-benchmarks</module>
<module>bucket4j-coherence</module>
<module>bucket4j-examples</module>
<module>lincheck-tests</module>
</modules>

<properties>
Expand Down

0 comments on commit f1f82b4

Please sign in to comment.