This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 47fe64b28159b529a2324a964c7504effdb0d873 Author: Nikita Timofeev <[email protected]> AuthorDate: Fri Jul 22 19:07:46 2022 +0300 CAY-2746 Cleanup root pom.xml - drop code quality profiles - drop unused dependencies and plugins - update dependencies and plugins --- assembly/pom.xml | 4 +- build-tools/cayenne-checkers/pom.xml | 170 ------ .../resources/cayenne-checkstyle-suppression.xml | 35 -- .../src/main/resources/cayenne-checkstyle.xml | 82 --- .../src/main/resources/cayenne-pmd.xml | 295 --------- .../main/resources/cayenne-tests-checkstyle.xml | 96 --- .../src/main/resources/cayenne-tests-pmd.xml | 658 --------------------- build-tools/pom.xml | 1 - cayenne-ant/pom.xml | 24 - cayenne-project-compatibility/pom.xml | 16 + .../upgrade/handlers/UpgradeHandler_V10Test.java | 4 +- .../upgrade/handlers/UpgradeHandler_V11Test.java | 4 +- .../upgrade/handlers/UpgradeHandler_V8Test.java | 5 +- .../upgrade/handlers/UpgradeHandler_V9Test.java | 4 +- cayenne-server/pom.xml | 4 +- .../apache/cayenne/access/DataContextCommitIT.java | 6 +- docs/asciidoc/pom.xml | 14 +- docs/doc/pom.xml | 7 - maven-plugins/cayenne-maven-plugin/pom.xml | 25 - maven-plugins/cayenne-modeler-maven-plugin/pom.xml | 25 - modeler/cayenne-modeler-generic-ext/pom.xml | 27 - modeler/cayenne-modeler-generic/pom.xml | 37 -- modeler/cayenne-modeler-mac-ext/pom.xml | 25 - modeler/cayenne-modeler-mac/pom.xml | 36 -- modeler/cayenne-modeler-win-ext/pom.xml | 26 - modeler/cayenne-modeler-win/pom.xml | 37 -- modeler/cayenne-modeler/pom.xml | 26 - modeler/cayenne-wocompat/pom.xml | 26 - pom.xml | 373 ++---------- 29 files changed, 78 insertions(+), 2014 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 8432e231b..6dea36e2d 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -204,7 +204,7 @@ <execution> <phase>${build.docs}</phase> <configuration> - <tasks> + <target> <copy todir="${project.build.directory}/doc-staging"> <fileset dir="${basedir}/../docs/asciidoc"> <include name="**/target/generated-docs/*.pdf" /> @@ -212,7 +212,7 @@ </fileset> <flattenmapper /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/build-tools/cayenne-checkers/pom.xml b/build-tools/cayenne-checkers/pom.xml deleted file mode 100644 index 32a86eb78..000000000 --- a/build-tools/cayenne-checkers/pom.xml +++ /dev/null @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-checkers</artifactId> - <version>4.3.M1-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>cayenne-checkers: Cayenne Code Checkers</name> - - <distributionManagement> - <repository> - <id>apache-releases</id> - <name>Apache Release Distribution Repository</name> - <url>https://repository.apache.org/service/local/staging/deploy/maven2</url> - </repository> - <snapshotRepository> - <id>apache.snapshots.https</id> - <name>Apache Development Snapshot Repository</name> - <url>https://repository.apache.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <organization> - <name>Apache Cayenne</name> - <url>https://cayenne.apache.org/</url> - </organization> - - <repositories> - <repository> - <id>objectstyle</id> - <name>ObjectStyle Repository</name> - <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>https://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>objectstyle</id> - <name>ObjectStyle repository</name> - <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> - - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> - <configuration> - <licenses> - <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"> - <notes>Also allow the license url to be https.</notes> - <patterns> - <pattern>https://www.apache.org/licenses/LICENSE-2.0</pattern> - </patterns> - </license> - </licenses> - </configuration> - </plugin> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.5</version> - <configuration> - <outputDirectory> - ${project.build.directory}/classes - </outputDirectory> - <resourceBundles> - <resourceBundle> - org.apache.cayenne.build-tools:cayenne-legal:${project.version} - </resourceBundle> - </resourceBundles> - </configuration> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>gpg</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - <executions> - <execution> - <id>sign-artifacts</id> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml deleted file mode 100644 index 50fef3b19..000000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?><!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<!DOCTYPE suppressions PUBLIC - "-//Puppy Crawl//DTD Suppressions 1.1//EN" - "suppressions_1_1.dtd"> - -<suppressions> - <!-- Suppress all checkstyle for autogenerated javacc package --> - <suppress checks=".*" files="org.apache.cayenne.ejbql.parser.*"/> - <suppress checks=".*" files="org.apache.cayenne.template.parser.*"/> - <suppress checks=".*" files="org.apache.cayenne.exp.parser.*"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParseException.java"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.Parser.java.java"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserConstants.java"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.ParserTokenManager.java"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.SimpleCharStream.java"/> - <suppress checks=".*" files="org.apache.cayenne.wocompat.parser.TokenMgrError.java"/> - -</suppressions> \ No newline at end of file diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml deleted file mode 100644 index 2dd06875d..000000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";><!-- Generated by Sonar --> -<module name="Checker"> - <module name="SuppressionCommentFilter"/> - <module name="TreeWalker"> - <module name="FileContentsHolder"/> - <module name="CyclomaticComplexity"> - <property name="severity" value="error"/> - <property name="max" value="15"/> - </module> - <module name="MethodLength"> - <property name="severity" value="warning"/> - <property name="max" value="200"/> - </module> - <module name="IllegalCatch"> - <property name="severity" value="warning"/> - </module> - - <module name="FallThrough"> - <property name="severity" value="warning"/> - </module> - <module name="EqualsHashCode"> - <property name="severity" value="warning"/> - </module> - <module name="MissingSwitchDefault"> - <property name="severity" value="warning"/> - </module> - <module name="ExecutableStatementCount"> - <property name="severity" value="error"/> - </module> - <module name="CovariantEquals"> - <property name="severity" value="warning"/> - </module> - <module name="ConstantName"> - <property name="severity" value="info"/> - <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|logger|log)$"/> - </module> - <module name="IllegalThrows"> - <property name="severity" value="warning"/> - </module> - <module name="ArrayTypeStyle"> - <property name="severity" value="info"/> - </module> - <module name="EqualsAvoidNull"> - <property name="severity" value="warning"/> - <property name="ignoreEqualsIgnoreCase" value="false"/> - </module> - <module name="AvoidNestedBlocks"> - <property name="severity" value="warning"/> - </module> - <module name="MissingDeprecated"> - <property name="severity" value="info"/> - </module> - <module name="DefaultComesLast"> - <property name="severity" value="warning"/> - </module> - <module name="BooleanExpressionComplexity"> - <property name="severity" value="warning"/> - </module> - <module name="EmptyBlock"> - <property name="severity" value="warning"/> - </module> - </module> -</module> diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml deleted file mode 100644 index 951e01afe..000000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-pmd.xml +++ /dev/null @@ -1,295 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<ruleset> - - <rule ref="rulesets/java/optimizations.xml/AvoidArrayLoops"> - <priority>3</priority> - </rule> - - <rule ref="rulesets/java/basic.xml/BooleanInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/logging-java.xml/LoggerIsNotStaticFinal"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/AbstractClassWithoutAbstractMethod"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/AbstractClassWithoutAnyMethod"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/AvoidProtectedFieldInFinalClass"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidThrowingRawExceptionTypes"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/codesize.xml/CyclomaticComplexity"> - <priority>2</priority> - <properties> - <property name="reportLevel" value="30" /> - </properties> - </rule> - <rule ref="rulesets/java/controversial.xml/DoNotCallGarbageCollectionExplicitly"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyCatchBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyFinallyBlock"> - <priority>1</priority> - </rule> - <!--<rule ref="rulesets/java/empty.xml/EmptyIfStmt">--> - <!--<priority>3</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/codesize.xml/ExcessiveClassLength"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/codesize.xml/ExcessiveParameterList"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/migrating.xml/AvoidEnumAsIdentifier"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidCatchingNPE"> - <priority>3</priority> - </rule> - <!--<rule ref="rulesets/java/strictexception.xml/AvoidCatchingThrowable">--> - <!--<priority>3</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/AvoidUsingHardCodedIP"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/BrokenNullCheck"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/basic.xml/ClassCastExceptionWithToArray"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/AvoidMultipleUnaryOperators"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/j2ee.xml/DoNotCallSystemExit"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/DoNotExtendJavaLangError"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/DoNotThrowExceptionInFinally"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/AvoidCallingFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/AvoidDeeplyNestedIfStmts"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNullPointerException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/naming.xml/ClassNamingConventions"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/naming.xml/MethodNamingConventions"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/naming.xml/MethodWithSameNameAsEnclosingClass"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/naming.xml/ShortMethodName"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/braces.xml/WhileLoopsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/design.xml/AvoidInstanceofChecksInCatchClause"> - <priority>3</priority> - </rule> - - <rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/braces.xml/IfElseStmtsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/braces.xml/IfStmtsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/codesize.xml/TooManyMethods"> - <priority>3</priority> - <properties> - <property name="maxmethods" value="30" /> - </properties> - </rule> - <rule ref="rulesets/java/migrating.xml/ByteInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/migrating.xml/LongInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/migrating.xml/ShortInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptySynchronizedBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyWhileStmt"> - <priority>3</priority> - </rule> - <!--<rule ref="rulesets/java/design.xml/EqualsNull">--> - <!--<priority>3</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/basic.xml/MisplacedNullCheck"> - <priority>1</priority> - </rule> - <!--<rule ref="rulesets/java/design.xml/MissingBreakInSwitch">--> - <!--<priority>3</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/j2ee.xml/UseProperClassLoader"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/unnecessary.xml/UselessOperationOnImmutable"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/logging-java.xml/MoreThanOneLogger"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/logging-java.xml/AvoidPrintStackTrace"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidRethrowingException"> - <priority>3</priority> - </rule> - <!--<rule ref="rulesets/java/design.xml/PreserveStackTrace">--> - <!--<priority>1</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/logging-java.xml/SystemPrintln"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/controversial.xml/AssignmentInOperand"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/optimizations.xml/AddEmptyString"> - <priority>1</priority> - </rule> - <rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/naming.xml/SuspiciousEqualsMethodName"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/clone.xml/ProperCloneImplementation"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/AvoidThreadGroup"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidCatchingGenericException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidLosingExceptionInformation"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/BadComparison"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyInitializer"> - <priority>3</priority> - </rule> - <!--<rule ref="rulesets/java/design.xml/CompareObjectsWithEquals">--> - <!--<priority>3</priority>--> - <!--</rule>--> - <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/EmptyMethodInAbstractClassShouldBeAbstract"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyTryBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strings.xml/StringToString"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/optimizations.xml/UseArrayListInsteadOfVector"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/clone.xml/CloneThrowsCloneNotSupportedException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/CloseResource"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/DoubleCheckedLocking"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/AvoidUsingOctalValues"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptySwitchStatements"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/empty.xml/EmptyStaticInitializer"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/EmptyFinalizer"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/ExceptionAsFlowControl"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/FinalizeOnlyCallsSuperFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/FinalizeDoesNotCallSuperFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/FinalizeOverloaded"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/finalizers.xml/FinalizeShouldBeProtected"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strings.xml/InefficientEmptyStringCheck"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/java/strictexception.xml/AvoidThrowingNewInstanceOfSameException"> - <priority>3</priority> - </rule> -</ruleset> - diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-checkstyle.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-checkstyle.xml deleted file mode 100644 index 258fd23b1..000000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-checkstyle.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";><!-- Generated by Sonar --> -<module name="Checker"> - <module name="SuppressionCommentFilter"/> - <module name="TreeWalker"> - <module name="FileContentsHolder"/> - <module name="CyclomaticComplexity"> - <property name="severity" value="error"/> - <property name="max" value="15"/> - </module> - <module name="MethodLength"> - <property name="severity" value="warning"/> - <property name="max" value="200"/> - </module> - <module name="FallThrough"> - <property name="severity" value="warning"/> - </module> - <module name="EqualsHashCode"> - <property name="severity" value="warning"/> - </module> - <module name="CovariantEquals"> - <property name="severity" value="warning"/> - </module> - <module name="VisibilityModifier"> - <property name="severity" value="info"/> - </module> - <module name="ConstantName"> - <property name="severity" value="info"/> - <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|logger|log)$"/> - </module> - <module name="IllegalThrows"> - <property name="severity" value="warning"/> - </module> - <module name="ArrayTypeStyle"> - <property name="severity" value="info"/> - </module> - <module name="LeftCurly"> - <property name="severity" value="info"/> - </module> - <module name="AnonInnerLength"> - <property name="severity" value="warning"/> - </module> - <module name="com.exigen.ipb.rules.checkstyle.javadoc.PublicApiJavadocMethodCheck"> - <property name="severity" value="warning"/> - <property name="allowMissingPropertyJavadoc" value="true"/> - <property name="suppressLoadErrors" value="true"/> - <property name="checkOnlyInterfaces" value="true"/> - </module> - <module name="EqualsAvoidNull"> - <property name="severity" value="warning"/> - <property name="ignoreEqualsIgnoreCase" value="false"/> - </module> - <module name="DeclarationOrder"> - <property name="severity" value="info"/> - </module> - <module name="AvoidNestedBlocks"> - <property name="severity" value="warning"/> - </module> - <module name="com.exigen.ipb.rules.checkstyle.javadoc.PublicApiJavadocStyleCheck"> - <property name="severity" value="warning"/> - <property name="checkFirstSentence" value="false"/> - <property name="checkEmptyJavadoc" value="true"/> - <property name="checkOnlyInterfaces" value="true"/> - </module> - <module name="MissingDeprecated"> - <property name="severity" value="info"/> - </module> - <module name="DefaultComesLast"> - <property name="severity" value="warning"/> - </module> - <module name="BooleanExpressionComplexity"> - <property name="severity" value="warning"/> - </module> - <module name="EmptyBlock"> - <property name="severity" value="warning"/> - </module> - </module> -</module> diff --git a/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-pmd.xml b/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-pmd.xml deleted file mode 100644 index 09b48938f..000000000 --- a/build-tools/cayenne-checkers/src/main/resources/cayenne-tests-pmd.xml +++ /dev/null @@ -1,658 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - --> -<ruleset> - <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/BooleanInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AbstractClassWithoutAnyMethod"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"> - <priority>3</priority> - </rule> - <rule ref="rulesets/codesize.xml/CyclomaticComplexity"> - <priority>2</priority> - <properties> - <property name="reportLevel" value="15" /> - </properties> - </rule> - <rule ref="rulesets/controversial.xml/DoNotCallGarbageCollectionExplicitly"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyCatchBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyFinallyBlock"> - <priority>1</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyIfStmt"> - <priority>3</priority> - </rule> - <rule ref="rulesets/codesize.xml/ExcessiveClassLength"> - <priority>3</priority> - </rule> - <rule ref="rulesets/codesize.xml/ExcessiveParameterList"> - <priority>3</priority> - </rule> - <rule ref="rulesets/codesize.xml/ExcessivePublicCount"> - <priority>4</priority> - </rule> - <rule ref="rulesets/migrating.xml/AvoidEnumAsIdentifier"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"> - <priority>3</priority> - </rule> - - - <rule ref="rulesets/empty.xml/BrokenNullCheck"> - <priority>1</priority> - </rule> - <rule ref="rulesets/empty.xml/ClassCastExceptionWithToArray"> - <priority>3</priority> - </rule> - <rule ref="rulesets/j2ee.xml/DoNotCallSystemExit"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/DoNotExtendJavaLangError"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/DoNotThrowExceptionInFinally"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"> - <priority>3</priority> - </rule> - <rule ref="rulesets/controversial.xml/AvoidFinalLocalVariable"> - <priority>4</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/BooleanGetMethodName"> - <priority>4</priority> - </rule> - <rule ref="rulesets/controversial.xml/DefaultPackage"> - <priority>5</priority> - </rule> - <rule ref="rulesets/naming.xml/ClassNamingConventions"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/MethodNamingConventions"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/ShortMethodName"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/PackageCase"> - <priority>4</priority> - </rule> - <rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/AvoidMultipleUnaryOperators"> - <priority>3</priority> - </rule> - <rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"> - <priority>1</priority> - </rule> - <rule ref="rulesets/codesize.xml/TooManyMethods"> - <priority>3</priority> - <properties> - <property name="maxmethods" value="30" /> - </properties> - </rule> - <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"> - <priority>4</priority> - </rule> - <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"> - <priority>4</priority> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Avoid Calendar.getInstance use DateUtils" name="XPathRule_1303219869"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//Expression[PrimaryExpression/PrimaryPrefix/Name[@Image = 'Calendar.getInstance']]]]></value> - </property> - </properties> - </rule> - <rule ref="rulesets/migrating.xml/ByteInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/migrating.xml/LongInstantiation"> - <priority>1</priority> - </rule> - <rule ref="rulesets/migrating.xml/ShortInstantiation"> - <priority>1</priority> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Deleting root entity should cause deletion of related child entities." name="EIS coding rules-CascadeDelete"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - Annotation/*/ - MemberValuePairs/MemberValuePair['cascade']/*/*/*/Name/@Image='CascadeType.ALL' - and not( - Annotation/*[ - Name/@Image='Cascade' - and - ends-with(MemberValue/*/*/Name/@Image,'DELETE_ORPHAN') - ] - ) - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to specify Association Table for ManyToMany" name="EIS coding rules-AssociationTableShouldExistsForManyToMany"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - ( - ../../../../TypeDeclaration/*/*/Name/@Image='Entity' - or - ../../../../TypeDeclaration/*/*/Name/@Image='MappedSuperclass' - or - ../../../../TypeDeclaration/*/*/Name/@Image='Embeddable' - ) - and Annotation/*/Name/@Image='ManyToMany' - and not(Annotation/*/Name/@Image='JoinTable') - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to specify FetchType for Object Graph Loading" name="EIS coding rules-ObjectGraphLoading"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - ( - ../../../../TypeDeclaration/*/*/Name/@Image='Entity' - or - ../../../../TypeDeclaration/*/*/Name/@Image='MappedSuperclass' - or - ../../../../TypeDeclaration/*/*/Name/@Image='Embeddable' - ) - and (Annotation/*/Name[ends-with(@Image,'ToMany') or starts-with(@Image,'ManyTo')] - ) - and not(Annotation/*/MemberValuePairs/MemberValuePair['fetch']/*/*/*/Name/@Image='FetchType.EAGER') - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to create foreign key for associations." name="EIS coding rules-FKConstraintShouldBeSpecified"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[Annotation/*/Name - [@Image='OneToOne' or ends-with(@Image,'ToMany') or starts-with(@Image,'ManyTo')] - and - not(Annotation/*[(Name/@Image='ForeignKey' - and - MemberValuePairs/MemberValuePair['name']/*/*/*/Literal[starts-with(@Image,'"FK_') and (string-length(@Image))<=32]) - ]) - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent of mixed JPA annotations declaration (both on fields and methods)." name="EIS coding rules-JPAAnnotationsShouldBeDefinedOnFields"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - ( - ../../../../TypeDeclaration/*/*/Name/@Image='Entity' - or - ../../../../TypeDeclaration/*/*/Name/@Image='MappedSuperclass' - or - ../../../../TypeDeclaration/*/*/Name/@Image='Embeddable' - ) - and - (starts-with(MethodDeclaration/MethodDeclarator/@Image,'get') - or - starts-with(MethodDeclaration/MethodDeclarator/@Image,'set')) - and - Annotation/*/Name[ - @Image = 'Id' or - @Image = 'Colum' or - @Image = 'Version' or - @Image = 'Transient' or - @Image = 'Enumerated' or - @Image = 'Basic' or - @Image = 'AttributeOverrides' or - @Image = 'AttributeOverride' or - @Image = 'EmbeddedId' or - @Image = 'Embedded' or - @Image = 'Id' or - @Image = 'GeneratedValue' or - @Image = 'JoinTable' or - @Image = 'JoinColumn' or - @Image = 'JoinColumns' or - @Image = 'AssociationOverrides' or - @Image = 'AssociationOverride' or - @Image = 'OneToOne' or - @Image = 'OneToMany' or - @Image = 'ManyToOne' or - @Image = 'ManyToMany' or - @Image = 'MapKay' or - @Image = 'OrderBy' or - @Image = 'SequenceGenerator' or - @Image = 'TableGenerator' or - @Image = 'TableGenerator' or - @Image = 'PrimaryKeyJoinColumns' or - @Image = 'PrimaryKeyJoinColumn' or - @Image = 'PersistenceUnits' or - @Image = 'PersistenceUnit' - ] - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Do NOT use System.currentTimeMillis, instead use DateUtils" name="XPathRule_1303290639"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//PrimaryExpression[PrimaryPrefix/Name[@Image = 'System.currentTimeMillis']]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent use of use Locale.getDefault()" name="EIS coding rules-DoNotUseLocaleGetDefault"> - <priority>1</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//PrimaryExpression//Name[@Image='Locale.getDefault']]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent use of EnumType.ORDINAL" name="EIS coding rules-EnumShoulBePersistedAsStrings"> - <priority>1</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - Annotation[ - */Name/@Image='Enumerated' - and - not(( - NormalAnnotation[ - MemberValuePairs/MemberValuePair['value']/MemberValue/PrimaryExpression/PrimaryPrefix/Name/@Image='EnumType.STRING'] - or - SingleMemberAnnotation[ - MemberValue/PrimaryExpression/PrimaryPrefix/Name/@Image='EnumType.STRING']) - )] - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to specify length for string columns." name="EIS coding rules-DefineLengthForString"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - ( - ../../../../TypeDeclaration/*/*/Name/@Image='Entity' - or - ../../../../TypeDeclaration/*/*/Name/@Image='MappedSuperclass' - or - ../../../../TypeDeclaration/*/*/Name/@Image='Embeddable' - ) - and - FieldDeclaration/Type/ReferenceType/ClassOrInterfaceType/@Image='String' - and - (not (Annotation/*/Name/@Image='Column') - or - (Annotation/*/Name/@Image='Column' - and - not (Annotation/*/MemberValuePairs/MemberValuePair['length'])) - ) - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force Entities to inherit BaseEntity." name="EIS coding rules-DomainShouldInheritBaseEntity"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//TypeDeclaration[ - (Annotation/*/Name/@Image='Entity') - and - count(ClassOrInterfaceDeclaration/ExtendsList) = 0 - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to specify @IndexColum annotation for List type collections." name="EIS coding rules-IndexColumnForListShouldPresent"> - <priority>5</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//ClassOrInterfaceBodyDeclaration[ - FieldDeclaration/Type/ReferenceType/ClassOrInterfaceType/@Image='List' - and not( - Annotation/*/Name/@Image='IndexColumn' - ) - and not( - Annotation/*/Name/@Image='Transient' - ) - and( - ../../../../TypeDeclaration/Annotation/*/Name/@Image='Entity' - or - ../../../../TypeDeclaration/Annotation/*/Name/@Image='MappedSuperclass' - or - ../../../../TypeDeclaration/Annotation/*/Name/@Image='Embeddable' - ) - ]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent use of use primitives in domain." name="EIS coding rules-DoNotUsePrimitivesForDomainModel"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//FieldDeclaration[ - (@Static='false') - and Type/PrimitiveType - and( - ../../../../../TypeDeclaration/*/*/Name/@Image='Entity' - or - ../../../../../TypeDeclaration/*/*/Name/@Image='MappedSuperclass' - or - ../../../../../TypeDeclaration/*/*/Name/@Image='Embeddable' - ) - ]]]></value> - </property> - </properties> - </rule> - <rule ref="rulesets/empty.xml/EmptySynchronizedBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyWhileStmt"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/EqualsNull"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/MisplacedNullCheck"> - <priority>1</priority> - </rule> - <rule ref="rulesets/design.xml/MissingBreakInSwitch"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/UnconditionalIfStatement"> - <priority>1</priority> - </rule> - <rule ref="rulesets/j2ee.xml/UseProperClassLoader"> - <priority>1</priority> - </rule> - <rule ref="rulesets/empty.xml/UselessOperationOnImmutable"> - <priority>1</priority> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent of declaration @Transactional annotation on java intefaces and classes." name="EIS coding rules-TransactionalAllowedOnlyOnMethod"> - <priority>1</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//TypeDeclaration/Annotation[*/Name[@Image='Transactional'] and ../ClassOrInterfaceDeclaration[@Public='true' and @Interface='true' and @Static='false']]]]></value> - </property> - </properties> - </rule> - <rule ref="rulesets/logging-jakarta-commons.xml/GuardDebugLogging"> - <priority>1</priority> - </rule> - <rule ref="rulesets/logging-java.xml/MoreThanOneLogger"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/ConstantsInInterface"> - <priority>3</priority> - </rule> - <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"> - <priority>1</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidRethrowingException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/logging-java.xml/SystemPrintln"> - <priority>1</priority> - </rule> - <rule ref="rulesets/controversial.xml/AssignmentInOperand"> - <priority>3</priority> - </rule> - <rule ref="rulesets/optimizations.xml/AddEmptyString"> - <priority>1</priority> - </rule> - <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"> - <priority>3</priority> - </rule> - <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"> - <priority>3</priority> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Force to change toDateMidnight() to toDateTimeAtStartOfDay()" name="EIS coding rules-PreventUsingToDateMidnightMethod"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[( - //PrimaryPrefix[ends-with(Name/@Image, "toDateMidnight")] - | - //PrimarySuffix[ends-with(@Image, "toDateMidnight")] - )[//ImportDeclaration/Name[@Image='org.joda.time.LocalDate'] or //ImportDeclaration/Name[@Image='org.joda.time']]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Do not use org.joda.time.LocalDate.toDateMidnight() use instead org.joda.time.LocalDate.toDateTimeAtStartOfDay()" name="EIS coding rules-AvoidUsingLocalDateToMidnight"> - <priority>2</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//TypeDeclaration/ClassOrInterfaceDeclaration//*[contains(@Image, 'toDateMidnight')]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Avoid new Date() instead use DateUtils" name="EIS coding rules-AvoidUseNewDate"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//Expression[PrimaryExpression/PrimaryPrefix/AllocationExpression/ClassOrInterfaceType[@Image = 'Date']]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Don't use org.apache.log4j.Logger import, use slf4j+logback." name="EIS coding rules - log4j is replaced by logback slf4j+logback"> - <priority>1</priority> - <properties> - <property name="xpath"> - <value><![CDATA[ImportDeclaration/Name[@Image='org.apache.log4j.Logger']]]></value> - </property> - </properties> - </rule> - <rule ref="rulesets/strings.xml/AvoidStringBufferField"> - <priority>5</priority> - </rule> - <rule ref="rulesets/controversial.xml/AvoidUsingShortType"> - <priority>5</priority> - </rule> - <rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"> - <priority>3</priority> - </rule> - <rule ref="rulesets/controversial.xml/NullAssignment"> - <priority>5</priority> - </rule> - <rule ref="rulesets/design.xml/ReturnEmptyArrayRatherThanNull"> - <priority>5</priority> - </rule> - <rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"> - <priority>3</priority> - </rule> - <rule ref="rulesets/clone.xml/ProperCloneImplementation"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/AvoidThreadGroup"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidCatchingGenericException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidLosingExceptionInformation"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/BadComparison"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyInitializer"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/CompareObjectsWithEquals"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyStatementNotInLoop"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/EmptyMethodInAbstractClassShouldBeAbstract"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyTryBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strings.xml/StringToString"> - <priority>3</priority> - </rule> - <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"> - <priority>3</priority> - </rule> - <rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"> - <priority>4</priority> - </rule> - <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"> - <priority>4</priority> - </rule> - <rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"> - <priority>4</priority> - </rule> - <rule ref="rulesets/imports.xml/DontImportJavaLang"> - <priority>4</priority> - </rule> - <rule ref="rulesets/controversial.xml/DontImportSun"> - <priority>4</priority> - </rule> - <rule ref="rulesets/design.xml/UseCollectionIsEmpty"> - <priority>4</priority> - </rule> - <rule ref="rulesets/strings.xml/UselessStringValueOf"> - <priority>4</priority> - </rule> - <rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/CloseResource"> - <priority>3</priority> - </rule> - <rule ref="rulesets/j2ee.xml/DoNotUseThreads"> - <priority>3</priority> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Prevent use of Calendar.getInstance()" name="EIS coding rules-AvoidUsingCalendarGetInstance"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//Expression[PrimaryExpression/PrimaryPrefix/Name[@Image = 'Calendar.getInstance']]]]></value> - </property> - </properties> - </rule> - <rule class="net.sourceforge.pmd.rules.XPathRule" message="Do not use System.currentTimeMillis() use instead exigen com.exigen.ipb.base.datatypes.DateUtils class methods." name="EIS coding rules-AvoidSystemCurrebtTimeMillis"> - <priority>3</priority> - <properties> - <property name="xpath"> - <value><![CDATA[//PrimaryExpression[PrimaryPrefix/Name[@Image = 'System.currentTimeMillis']]]]></value> - </property> - </properties> - </rule> - <rule ref="rulesets/basic.xml/DoubleCheckedLocking"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"> - <priority>3</priority> - </rule> - <rule ref="rulesets/basic.xml/AvoidUsingOctalValues"> - <priority>3</priority> - </rule> - <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptySwitchStatements"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/EmptyStaticInitializer"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/EmptyFinalizer"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/FinalizeOverloaded"> - <priority>3</priority> - </rule> - <rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strings.xml/InefficientEmptyStringCheck"> - <priority>3</priority> - </rule> - <rule ref="rulesets/empty.xml/ReturnFromFinallyBlock"> - <priority>3</priority> - </rule> - <rule ref="rulesets/strictexception.xml/AvoidThrowingNewInstanceOfSameException"> - <priority>3</priority> - </rule> -</ruleset> - diff --git a/build-tools/pom.xml b/build-tools/pom.xml index d402f02cc..48e2102bc 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -35,7 +35,6 @@ <modules> <module>cayenne-legal</module> <module>cayenne-test-utilities</module> - <module>cayenne-checkers</module> </modules> <build> diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml index 6f6a9e765..f44ac436c 100644 --- a/cayenne-ant/pom.xml +++ b/cayenne-ant/pom.xml @@ -127,28 +127,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/cayenne-project-compatibility/pom.xml b/cayenne-project-compatibility/pom.xml index b034600e7..7db5f7f06 100644 --- a/cayenne-project-compatibility/pom.xml +++ b/cayenne-project-compatibility/pom.xml @@ -58,4 +58,20 @@ <scope>test</scope> </dependency> </dependencies> + + <build> + <plugins> + <!-- This ensures LICENSE and NOTICE inclusion in all jars --> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java index 6b86cffb3..addf403bd 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10Test.java @@ -26,7 +26,7 @@ import org.w3c.dom.Element; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; /** * @since 4.1 @@ -61,6 +61,6 @@ public class UpgradeHandler_V10Test extends BaseUpgradeHandlerTest{ public void testModelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); - verifyZeroInteractions(descriptor); + verifyNoInteractions(descriptor); } } \ No newline at end of file diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java index 4a2d7d5b4..ffc195d87 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; /** * @since 4.3 @@ -122,6 +122,6 @@ public class UpgradeHandler_V11Test extends BaseUpgradeHandlerTest{ public void testModelUpgrade() { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); - verifyZeroInteractions(descriptor); + verifyNoInteractions(descriptor); } } \ No newline at end of file diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java index b3c3b4649..f077611f0 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8Test.java @@ -28,8 +28,7 @@ import org.w3c.dom.NodeList; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; /** * @since 4.1 @@ -92,6 +91,6 @@ public class UpgradeHandler_V8Test extends BaseUpgradeHandlerTest { public void testModelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); - verifyZeroInteractions(descriptor); + verifyNoInteractions(descriptor); } } \ No newline at end of file diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java index f22fa6792..48d859ecf 100644 --- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java +++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9Test.java @@ -26,7 +26,7 @@ import org.w3c.dom.Element; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; /** * @since 4.1 @@ -64,6 +64,6 @@ public class UpgradeHandler_V9Test extends BaseUpgradeHandlerTest { public void testModelUpgrade() throws Exception { DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class); handler.processModel(descriptor); - verifyZeroInteractions(descriptor); + verifyNoInteractions(descriptor); } } diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml index 81bc5bb63..455f22720 100644 --- a/cayenne-server/pom.xml +++ b/cayenne-server/pom.xml @@ -193,10 +193,10 @@ <execution> <phase>process-sources</phase> <configuration> - <tasks> + <target> <!-- This will remove duplicate Node file --> <delete file="${project.build.directory}/generated-sources/jjtree/org/apache/cayenne/ejbql/parser/Node.java" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java index e4326f5c7..ae616a570 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextCommitIT.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import org.apache.cayenne.ObjectId; import org.apache.cayenne.di.Inject; @@ -67,7 +67,7 @@ public class DataContextCommitIT extends ServerCase { diff.apply(diffChecker); verify(diffChecker).nodeIdChanged(beforeId, afterId); - verifyZeroInteractions(diffChecker); + verifyNoMoreInteractions(diffChecker); } @@ -95,7 +95,7 @@ public class DataContextCommitIT extends ServerCase { diff.apply(diffChecker); verify(diffChecker).nodeIdChanged(beforeId, afterId); - verifyZeroInteractions(diffChecker); + verifyNoMoreInteractions(diffChecker); } @Test diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml index 6e2e3fa78..f4395ff2e 100644 --- a/docs/asciidoc/pom.xml +++ b/docs/asciidoc/pom.xml @@ -41,12 +41,11 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <asciidoctorj.version>1.6.2</asciidoctorj.version> - <asciidoctor.maven.plugin.version>1.5.8</asciidoctor.maven.plugin.version> - <asciidoctorj.pdf.version>1.5.0-alpha.18</asciidoctorj.pdf.version> - <jruby.version>9.2.8.0</jruby.version> + <asciidoctorj.version>2.5.4</asciidoctorj.version> + <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version> + <asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version> <cayenne.version>${project.version}</cayenne.version> - <cayenne.major.version>4.2</cayenne.major.version> + <cayenne.major.version>4.3</cayenne.major.version> </properties> <dependencies> @@ -106,11 +105,6 @@ </attributes> </configuration> <dependencies> - <dependency> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - <version>${jruby.version}</version> - </dependency> <dependency> <groupId>org.asciidoctor</groupId> <artifactId>asciidoctorj</artifactId> diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml index ed140a1b4..52b3069e8 100644 --- a/docs/doc/pom.xml +++ b/docs/doc/pom.xml @@ -134,13 +134,6 @@ <destDir>doc/api</destDir> <stylesheet>java</stylesheet> <header><![CDATA[<a href="http://cayenne.apache.org"; target="top">Apache Cayenne</a>]]></header> - <additionalDependencies> - <additionalDependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>2.4.3</version> - </additionalDependency> - </additionalDependencies> </configuration> <executions> <execution> diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml index 54517604a..3e7e6eb76 100644 --- a/maven-plugins/cayenne-maven-plugin/pom.xml +++ b/maven-plugins/cayenne-maven-plugin/pom.xml @@ -154,30 +154,5 @@ </plugin> </plugins> </reporting> - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml index 12dbdc821..c3c3cc5e8 100644 --- a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml +++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml @@ -88,30 +88,5 @@ </plugins> </build> - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> diff --git a/modeler/cayenne-modeler-generic-ext/pom.xml b/modeler/cayenne-modeler-generic-ext/pom.xml index 09d27d43e..f04ccc601 100644 --- a/modeler/cayenne-modeler-generic-ext/pom.xml +++ b/modeler/cayenne-modeler-generic-ext/pom.xml @@ -62,31 +62,4 @@ <artifactId>jgoodies-looks</artifactId> </dependency> </dependencies> - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml index 957c3b364..7a03a83f9 100644 --- a/modeler/cayenne-modeler-generic/pom.xml +++ b/modeler/cayenne-modeler-generic/pom.xml @@ -81,42 +81,5 @@ </plugins> </build> </profile> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> </profiles> - - <pluginRepositories> - <pluginRepository> - <id>objectstyle</id> - <name>ObjectStyle repository</name> - <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> </project> diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml index 72875e713..dfde5304c 100644 --- a/modeler/cayenne-modeler-mac-ext/pom.xml +++ b/modeler/cayenne-modeler-mac-ext/pom.xml @@ -66,29 +66,4 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml index 372e399d1..f2beeeb64 100644 --- a/modeler/cayenne-modeler-mac/pom.xml +++ b/modeler/cayenne-modeler-mac/pom.xml @@ -67,28 +67,6 @@ </dependencies> <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> <profile> <id>mac</id> <build> @@ -121,18 +99,4 @@ </build> </profile> </profiles> - <pluginRepositories> - <pluginRepository> - <id>objectstyle</id> - <name>ObjectStyle repository</name> - <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> </project> diff --git a/modeler/cayenne-modeler-win-ext/pom.xml b/modeler/cayenne-modeler-win-ext/pom.xml index ca3f347b1..d9275ed8f 100644 --- a/modeler/cayenne-modeler-win-ext/pom.xml +++ b/modeler/cayenne-modeler-win-ext/pom.xml @@ -62,30 +62,4 @@ <artifactId>jgoodies-looks</artifactId> </dependency> </dependencies> - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> \ No newline at end of file diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml index 8aa4a7b3c..bd61c634f 100644 --- a/modeler/cayenne-modeler-win/pom.xml +++ b/modeler/cayenne-modeler-win/pom.xml @@ -112,42 +112,5 @@ </plugins> </build> </profile> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> </profiles> - - <pluginRepositories> - <pluginRepository> - <id>objectstyle</id> - <name>ObjectStyle repository</name> - <url>https://maven.objectstyle.org/nexus/content/groups/cayenne-deps</url> - <layout>default</layout> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> </project> diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml index 29e71f920..4cff481c9 100644 --- a/modeler/cayenne-modeler/pom.xml +++ b/modeler/cayenne-modeler/pom.xml @@ -102,30 +102,4 @@ <scope>test</scope> </dependency> </dependencies> - - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml index 156eb121b..15c2b8442 100644 --- a/modeler/cayenne-wocompat/pom.xml +++ b/modeler/cayenne-wocompat/pom.xml @@ -57,31 +57,5 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - </dependencies> - - <profiles> - <profile> - <id>code-quality</id> - - <activation> - <property> - <name>!fast-and-dirty</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--<configuration> - <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration>--> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff --git a/pom.xml b/pom.xml index bdcf583a6..31fce2485 100644 --- a/pom.xml +++ b/pom.xml @@ -37,10 +37,9 @@ <properties> <maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format> <project.build.datetime>${maven.build.timestamp}</project.build.datetime> - <jacoco.version>0.7.9</jacoco.version> - <slf4j.version>1.7.25</slf4j.version> - <ant.version>1.10.11</ant.version> - <testcontainers.version>1.16.0</testcontainers.version> + <slf4j.version>1.7.36</slf4j.version> + <ant.version>1.10.12</ant.version> + <testcontainers.version>1.17.3</testcontainers.version> <maven.compiler.target>11</maven.compiler.target> <maven.compiler.source>11</maven.compiler.source> @@ -341,13 +340,13 @@ <dependency> <groupId>com.mockrunner</groupId> <artifactId>mockrunner-jdbc</artifactId> - <version>1.1.2</version> + <version>2.0.6</version> <scope>test</scope> </dependency> <dependency> <groupId>ognl</groupId> <artifactId>ognl</artifactId> - <version>2.6.7</version> + <version>3.3.3</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -374,12 +373,12 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-engine-core</artifactId> - <version>2.1</version> + <version>2.3</version> </dependency> <dependency> <groupId>org.apache.velocity.tools</groupId> <artifactId>velocity-tools-generic</artifactId> - <version>3.0</version> + <version>3.1</version> </dependency> <dependency> <groupId>foundrylogic.vpp</groupId> @@ -399,27 +398,22 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.13.1</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.28.2</version> + <version>4.6.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - <version>2.4.3</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>2.4.1</version> + <version>2.6.1</version> <scope>test</scope> </dependency> + <!-- Derby 10.16 requires Java 17, Derby 10.15 requires additional dependency - derbytools --> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -531,7 +525,7 @@ <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh</artifactId> - <version>2.12</version> + <version>3.5.2</version> </extension> </extensions> @@ -571,20 +565,6 @@ <ignore /> </action> </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>com.agilejava.docbkx</groupId> - <artifactId>docbkx-maven-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>generate-pdf</goal> - <goal>generate-html</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> <pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> @@ -664,32 +644,6 @@ <ignore /> </action> </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <versionRange>[1.0,)</versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> <pluginExecution> <pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> @@ -710,18 +664,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.6.0</version> + <version>3.6.4</version> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> + <version>3.10.1</version> </plugin> <plugin> <artifactId>maven-deploy-plugin</artifactId> @@ -731,42 +682,30 @@ <artifactId>maven-release-plugin</artifactId> <version>2.5.3</version> </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>3.8</version> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>3.0.0</version> - </plugin> <plugin> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> + <version>3.1.0</version> </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> + <version>3.4.0</version> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> + <version>3.2.1</version> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>3.1.1</version> + <version>3.4.1</version> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> + <version>3.1.0</version> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -775,7 +714,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.3.0</version> + <version>5.1.7</version> </plugin> <plugin> <artifactId>maven-surefire-report-plugin</artifactId> @@ -784,11 +723,11 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> + <version>3.0.0</version> </plugin> <plugin> <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.5</version> + <version>1.7.0</version> <configuration> <outputDirectory> ${project.build.directory}/classes @@ -805,7 +744,7 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.1.1</version> + <version>3.4.0</version> <configuration> <!-- Suppress errors in the JavaDocs (it should be cleaned one day...) --> <doclint>none</doclint> @@ -821,7 +760,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> + <version>0.14</version> <configuration> <licenses> <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"> @@ -854,18 +793,8 @@ </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.2</version> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.33.0</version> + <version>3.2.2</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>3.3.1</version> - </plugin> </plugins> </pluginManagement> @@ -990,218 +919,6 @@ </distributionManagement> <profiles> - <profile> - <id>code-quality</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <skip>false</skip> - <consoleOutput>false</consoleOutput> - <enableRulesSummary>false</enableRulesSummary> - <failOnViolation>false</failOnViolation> - <!-- TODO make it 'true' when we will be ready --> - <violationSeverity>warning</violationSeverity> - <configLocation>build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle.xml</configLocation> - <suppressionsLocation>build-tools/cayenne-checkers/src/main/resources/cayenne-checkstyle-suppression.xml</suppressionsLocation> - </configuration> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <skip>false</skip> - <sourceEncoding>utf-8</sourceEncoding> - <targetJdk>11</targetJdk> - <verbose>true</verbose> - <failOnViolation>false</failOnViolation> - <!-- TODO make it 'true' when we will be ready --> - <failurePriority>2</failurePriority> - <rulesets> - <!-- go back on one dir to parent project --> - <ruleset>/cayenne-pmd.xml</ruleset> - </rulesets> - <excludes> - <exclude>**/ParseException.java</exclude> - <exclude>**/Token.java</exclude> - <exclude>**/TokenMgrError.java</exclude> - <exclude>**/ParseException.java</exclude> - <exclude>**/Parser.java.java</exclude> - <exclude>**/ParserConstants.java</exclude> - <exclude>**/ParserTokenManager.java</exclude> - <exclude>**/SimpleCharStream.java</exclude> - <exclude>**/TokenMgrError.java</exclude> - <exclude>org/apache/cayenne/ejbql/parser/*</exclude> - <exclude>org/apache/cayenne/exp/parser/*</exclude> - <exclude>org/apache/cayenne/template/parser/*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.cayenne.build-tools</groupId> - <artifactId>cayenne-checkers</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <version>2.8</version> - <configuration> - <comparisonVersion>3.1RC1</comparisonVersion> - <minSeverity>info</minSeverity> - <logResults>true</logResults> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <inherited>true</inherited> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <inherited>true</inherited> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <effort>Max</effort> - <threshold>Low</threshold> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - </plugin> - </plugins> - </reporting> - </profile> - - - <profile> - <id>code-coverage</id> - <properties> - <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file> - <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.0</version> - <executions> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${jacoco.ut.execution.data.file}</destFile> - <propertyName>surefireArgLine</propertyName> - </configuration> - </execution> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <dataFile>${jacoco.ut.execution.data.file}</dataFile> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - </configuration> - </execution> - - <execution> - <id>pre-integration-test</id> - <phase>pre-integration-test</phase> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <destFile>${jacoco.it.execution.data.file}</destFile> - <propertyName>failsafeArgLine</propertyName> - </configuration> - </execution> - - <execution> - <id>post-integration-test</id> - <phase>post-integration-test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <dataFile>${jacoco.it.execution.data.file}</dataFile> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefireArgLine}</argLine> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <id>integration-tests</id> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - <configuration> - <argLine>${failsafeArgLine}</argLine> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <!-- Optional profile used to sign artifacts --> <profile> <id>gpg</id> @@ -1210,7 +927,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> + <version>3.0.1</version> <executions> <execution> <id>sign-artifacts</id> @@ -1272,7 +989,7 @@ <dependency> <groupId>org.firebirdsql.jdbc</groupId> <artifactId>jaybird-jdk18</artifactId> - <version>3.0.3</version> + <version>4.0.6.java8</version> <scope>test</scope> </dependency> </dependencies> @@ -1306,7 +1023,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.195</version> + <version>2.1.214</version> <scope>test</scope> </dependency> </dependencies> @@ -1323,7 +1040,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>8.0.28</version> + <version>8.0.29</version> <scope>test</scope> </dependency> </dependencies> @@ -1340,7 +1057,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>8.0.28</version> + <version>8.0.29</version> <scope>test</scope> </dependency> </dependencies> @@ -1357,7 +1074,7 @@ <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>2.7.4</version> + <version>3.0.6</version> <scope>test</scope> </dependency> </dependencies> @@ -1375,7 +1092,7 @@ <dependency> <groupId>com.oracle.database.jdbc</groupId> <artifactId>ojdbc-bom</artifactId> - <version>21.1.0.0</version> + <version>21.6.0.0.1</version> <type>pom</type> <scope>import</scope> </dependency> @@ -1402,7 +1119,7 @@ <dependency> <groupId>com.oracle.database.jdbc</groupId> <artifactId>ojdbc-bom</artifactId> - <version>21.1.0.0</version> + <version>21.6.0.0.1</version> <type>pom</type> <scope>import</scope> </dependency> @@ -1428,7 +1145,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.3.3</version> + <version>42.4.0</version> <scope>test</scope> </dependency> </dependencies> @@ -1445,7 +1162,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.3.3</version> + <version>42.4.0</version> <scope>test</scope> </dependency> </dependencies> @@ -1477,7 +1194,7 @@ <dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>mssql-jdbc</artifactId> - <version>9.2.1.jre8</version> + <version>10.2.1.jre11</version> <scope>test</scope> </dependency> </dependencies> @@ -1494,7 +1211,7 @@ <dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>mssql-jdbc</artifactId> - <version>9.2.1.jre8</version> + <version>10.2.1.jre11</version> <scope>test</scope> </dependency> </dependencies> @@ -1545,7 +1262,7 @@ <dependency> <groupId>org.xerial</groupId> <artifactId>sqlite-jdbc</artifactId> - <version>3.25.2</version> + <version>3.36.0.3</version> <scope>test</scope> </dependency> </dependencies> @@ -1561,8 +1278,8 @@ <dependencies> <dependency> <groupId>com.ibm.db2</groupId> - <artifactId>db2-driver</artifactId> - <version>1.0</version> + <artifactId>jcc</artifactId> + <version>11.5.7.0</version> <scope>test</scope> </dependency> </dependencies> @@ -1579,7 +1296,7 @@ <dependency> <groupId>com.ibm.db2</groupId> <artifactId>jcc</artifactId> - <version>11.5.6.0</version> + <version>11.5.7.0</version> <scope>test</scope> </dependency> </dependencies> @@ -1606,10 +1323,6 @@ <reporting> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>
