Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Merge pull request #97 from eo-cqrs/96
Browse files Browse the repository at this point in the history 
Qulice complained, maven plugins, styling
  • Loading branch information
Aliaksei Bialiauski authored Jan 26, 2024
2 parents 4511a3b + ceeabae commit 5459001
Show file tree
Hide file tree
Showing 55 changed files with 1,319 additions and 1,121 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Check out all text files in UNIX format, with LF as end of line
# Don't change this file. If you have any ideas about it, please
# submit a separate issue about it and we'll discuss.

* text=auto eol=lf
*.java ident
*.xml ident
*.png binary
Empty file added .xcop
View file
Empty file.
8 changes: 4 additions & 4 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License
The MIT License (MIT)

Copyright (c) 2023 Aliaksei Bialiauski, EO-CQRS
Copyright (c) 2023-2024 Aliaksei Bialiauski, EO-CQRS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,8 +9,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
29 changes: 0 additions & 29 deletions checkstyle-suppressions.xml
View file

This file was deleted.

146 changes: 74 additions & 72 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
MIT License
The MIT License (MIT)
Copyright (c) 2023 Aliaksei Bialiauski, EO-CQRS
Copyright (c) 2023-2024 Aliaksei Bialiauski, EO-CQRS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -11,8 +11,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand All @@ -33,17 +33,16 @@ SOFTWARE.
<artifactId>cmig</artifactId>
<version>1.0-SNAPSHOT</version>
<name>cmig</name>
<description>
Apache Cassandra Schema Migration
</description>
<description>Apache Cassandra Schema Migration</description>
<inceptionYear>2023</inceptionYear>
<url>https://github.com/eo-cqrs/cmig</url>
<developers>
<developer>
<id>1</id>
<name>Aliaksei Bialiauski</name>
<email>abialiauski.dev@gmail.com</email>
<email>aliaksei.bialiauski@hey.com</email>
<url>https://h1alexbel.github.io</url>
<organization>Solvd</organization>
<organizationUrl>https://www.solvd.com</organizationUrl>
<roles>
<role>Architect</role>
Expand Down Expand Up @@ -95,11 +94,13 @@ SOFTWARE.
<maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
<mockito-core.version>5.10.0</mockito-core.version>
<mockito-junit-jupiter.version>5.10.0</mockito-junit-jupiter.version>
<hamcrest-all.version>1.3</hamcrest-all.version>
<hamcrest-core.version>2.2</hamcrest-core.version>
<guava.version>19.0</guava.version>
<test-cassandra.version>1.19.4</test-cassandra.version>
<failsafe.version>3.2.5</failsafe.version>
<unixized.version>1.0.0</unixized.version>
<logback-classic.version>1.4.8</logback-classic.version>
<cactoos-matchers.version>0.25</cactoos-matchers.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -147,6 +148,11 @@ SOFTWARE.
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ru.l3r8y</groupId>
<artifactId>unixized</artifactId>
<version>${unixized.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -161,19 +167,8 @@ SOFTWARE.
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>${hamcrest-all.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ru.l3r8y</groupId>
<artifactId>unixized</artifactId>
<version>${unixized.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assert4j-core.version}</version>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -188,6 +183,18 @@ SOFTWARE.
<version>${mockito-junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.llorllale</groupId>
<artifactId>cactoos-matchers</artifactId>
<version>${cactoos-matchers.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.cactoos</groupId>
<artifactId>cactoos</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>cassandra</artifactId>
Expand All @@ -198,46 +205,41 @@ SOFTWARE.
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<includes>
<include>**/*Spec.*</include>
<include>**/*Test.*</include>
</includes>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-verifier-plugin</artifactId>
<version>${maven-verifier-plugin.version}</version>
<groupId>com.qulice</groupId>
<artifactId>qulice-maven-plugin</artifactId>
<configuration>
<license>file:${basedir}/LICENSE.txt</license>
</configuration>
<executions>
<execution>
<id>main</id>
<phase>package</phase>
<goals>
<goal>verify</goal>
<goal>check</goal>
</goals>
<configuration>
<verificationFile>src/verifier/verifications.xml</verificationFile>
<excludes>
<exclude>duplicatefinder:.*</exclude>
<exclude>dependencies:.*</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
<includes>
<include>**/*Spec.*</include>
<include>**/*Test.*</include>
</includes>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -265,7 +267,7 @@ SOFTWARE.
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.59</minimum>
<minimum>0.58</minimum>
</limit>
<limit>
<counter>LINE</counter>
Expand Down Expand Up @@ -301,23 +303,18 @@ SOFTWARE.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<executions>
<execution>
<id>javadoc-generate</id>
<phase>test</phase>
<goals>
<goal>javadoc</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration>
</plugin>
<plugin>
Expand All @@ -332,6 +329,19 @@ SOFTWARE.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>javadoc-generate</id>
<phase>test</phase>
<goals>
<goal>javadoc</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>ru.l3r8y</groupId>
<artifactId>sa-tan</artifactId>
Expand All @@ -346,25 +356,17 @@ SOFTWARE.
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle.version}</version>
</dependency>
</dependencies>
<artifactId>maven-verifier-plugin</artifactId>
<version>${maven-verifier-plugin.version}</version>
<executions>
<execution>
<id>verify-style</id>
<phase>process-classes</phase>
<id>main</id>
<phase>package</phase>
<goals>
<goal>check</goal>
<goal>verify</goal>
</goals>
<configuration>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<verificationFile>src/verifier/verifications.xml</verificationFile>
</configuration>
</execution>
</executions>
Expand Down
Loading

2 comments on commit 5459001

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 5459001 Jan 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 36-9288a325 disappeared from src/main/java/io/github/eocqrs/cmig/Master.java), that's why I closed #65. Please, remember that the puzzle was not necessarily removed in this particular commit. Maybe it happened earlier, but we discovered this fact only now.

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 5459001 Jan 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 36-3f1b2d61 discovered in src/main/java/io/github/eocqrs/cmig/Master.java) and submitted as #98. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.