diff --git a/README.md b/README.md index 51495d985..e6e315409 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ -[![Donate via Zerocracy](https://www.0crat.com/contrib-badge/C3T49A35L.svg)](https://www.0crat.com/contrib/C3T49A35L) - [![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org) [![Managed by Zerocracy](https://www.0crat.com/badge/C3T49A35L.svg)](https://www.0crat.com/p/C3T49A35L) [![DevOps By Rultor.com](http://www.rultor.com/b/teamed/qulice)](http://www.rultor.com/p/teamed/qulice) @@ -84,8 +82,3 @@ sending us your pull request please run full Maven build: > mvn clean install -Pqulice Keep in mind that JDK7 and Maven 3.1.0 are the lowest versions you may use. - -## Got questions? - -If you have questions or general suggestions, don't hesitate to submit -a new [Github issue](https://github.com/tpc2/qulice/issues/new). diff --git a/pom.xml b/pom.xml index 3336182ce..9b16be24d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. com.jcabi parent - 0.49.5 + 0.54.1 com.qulice qulice @@ -50,43 +50,27 @@ OF THE POSSIBILITY OF SUCH DAMAGE. qulice-spotbugs qulice-gradle-plugin - + Quality control library, integrating together other static analysis and validation tools and instruments. http://www.qulice.com 2011 Qulice.com - http://www.qulice.com + https://www.qulice.com BSD - http://www.qulice.com/LICENSE.txt + https://www.qulice.com/LICENSE.txt repo - - - - Qulice Discussions - qulice@googlegroups.com - qulice@googlegroups.com - qulice@googlegroups.com - http://groups.google.com/group/qulice - - 1 Yegor Bugayenko - yegor@tpc2.com - tpc2.com - http://www.tpc2.com + yegor256@gmail.com.com + Zerocracy + https://www.zerocracy.com Architect Developer @@ -110,27 +94,15 @@ OF THE POSSIBILITY OF SUCH DAMAGE. github-pages - http://www.qulice.com + https://www.qulice.com - - com.jcabi - jcabi-xml - 0.17.1 - - - org.antlr - antlr4-runtime - 4.7.1 - - - org.apache.commons - commons-lang3 - 3.7 + org.slf4j + slf4j-api + 2.0.0-alpha5 org.cactoos @@ -160,13 +132,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE. - - maven-compiler-plugin - - 8 - 8 - - maven-jar-plugin @@ -178,27 +143,8 @@ OF THE POSSIBILITY OF SUCH DAMAGE. - - maven-javadoc-plugin - 3.0.0 - - - - todo - a - todo: - - - checkstyle - a - checkstyle: - - - - maven-surefire-plugin - 3.0.0-M3 false random @@ -214,7 +160,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE. maven-failsafe-plugin - 3.0.0-M3 ${project.build.sourceEncoding} false @@ -286,7 +231,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE. com.qulice qulice-maven-plugin - 0.17.4 diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java index e76c59b70..cf468d800 100644 --- a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java +++ b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java @@ -46,7 +46,7 @@ import org.hamcrest.Matchers; import org.hamcrest.TypeSafeMatcher; import org.hamcrest.collection.IsIterableContainingInOrder; -import org.junit.Rule; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -82,11 +82,14 @@ public final class CheckstyleValidatorTest { private static final String LICENSE = "Hello."; /** - * License rule. - * @checkstyle VisibilityModifierCheck (5 lines) + * Rule for testing. */ - @Rule - public final LicenseRule rule = new LicenseRule(); + private License rule; + + @BeforeEach + public void setRule() { + this.rule = new License(); + } /** * CheckstyleValidator can catch checkstyle violations. diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/LicenseRule.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java similarity index 89% rename from qulice-checkstyle/src/test/java/com/qulice/checkstyle/LicenseRule.java rename to qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java index 52a825dc7..c6b2b3884 100644 --- a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/LicenseRule.java +++ b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/License.java @@ -35,15 +35,12 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; import org.cactoos.text.Joined; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; /** * Builder of {@code LICENSE.txt} content. * @since 0.4 */ -public final class LicenseRule implements TestRule { +public final class License { /** * The text. @@ -65,18 +62,12 @@ public final class LicenseRule implements TestRule { */ private File directory; - @Override - public Statement apply(final Statement statement, - final Description description) { - return statement; - } - /** * Use this EOL. * @param txt What to use as end-of-line character * @return This object */ - public LicenseRule withEol(final String txt) { + public License withEol(final String txt) { this.eol = txt; return this; } @@ -86,7 +77,7 @@ public LicenseRule withEol(final String txt) { * @param lns The lines to use * @return This object */ - public LicenseRule withLines(final String... lns) { + public License withLines(final String... lns) { this.lines = new String[lns.length]; System.arraycopy(lns, 0, this.lines, 0, lns.length); return this; @@ -97,7 +88,7 @@ public LicenseRule withLines(final String... lns) { * @param name The name of package * @return This object */ - public LicenseRule withPackage(final String name) { + public License withPackage(final String name) { this.pkg = name; return this; } @@ -107,7 +98,7 @@ public LicenseRule withPackage(final String name) { * @param dir The folder to save to * @return This object */ - public LicenseRule savePackageInfo(final File dir) { + public License savePackageInfo(final File dir) { this.directory = dir; return this; } diff --git a/qulice-maven-plugin/src/main/java/com/qulice/maven/EnforcerValidator.java b/qulice-maven-plugin/src/main/java/com/qulice/maven/EnforcerValidator.java index 02b2c0895..4bdf6422e 100644 --- a/qulice-maven-plugin/src/main/java/com/qulice/maven/EnforcerValidator.java +++ b/qulice-maven-plugin/src/main/java/com/qulice/maven/EnforcerValidator.java @@ -54,7 +54,7 @@ public void validate(final MavenEnvironment env) rules.put("requireJavaVersion", java); java.put("version", "1.7"); env.executor().execute( - "org.apache.maven.plugins:maven-enforcer-plugin:1.0-beta-1", + "org.apache.maven.plugins:maven-enforcer-plugin:3.0.0", "enforce", props );