Author: gk
Date: Tue Jan 4 10:25:37 2022
New Revision: 1896666
URL: http://svn.apache.org/viewvc?rev=1896666&view=rev
Log:
- Fix pom plugins: replace deprecated Findbugs with Spotbugs (supports
FinBugsFilter), add maven Enforcer (setting minimum maven version to 3.3.9),
update Checkstyle, add Checksum (generate sha512) for assembly artefacts in
profile apache-release.
Modified:
db/torque/trunk/README.md
db/torque/trunk/pom.xml
Modified: db/torque/trunk/README.md
URL:
http://svn.apache.org/viewvc/db/torque/trunk/README.md?rev=1896666&r1=1896665&r2=1896666&view=diff
==============================================================================
--- db/torque/trunk/README.md (original)
+++ db/torque/trunk/README.md Tue Jan 4 10:25:37 2022
@@ -53,17 +53,19 @@ or try it with default database and acti
### Core modules
-*Torque-generator* is the core module providing the mechanism to generate the
mappings, which are provided by *Torque-templates* module.
-You need the ant tool installed.
+*Torque-generator* is the core module providing the mechanism to generate the
mappings,
+which are provided by *Torque-templates* module. You need the ant tool
installed.
*Torque-runtime* is the only module needed, if building / generation step was
done.
#### Test module
-Two kinds of tests exist. Module "internal" tests without database dependency
or explicitely inlined dependency as in torque-templates (ddl templates) and
database testing in the module "Torque-test".
+Two kinds of tests exist. Module "internal" tests without database dependency
or explicitely inlined
+dependency as in torque-templates (ddl templates) database testing in the
module "Torque-test".
-*Torque-test* allows to test against databases and provides a
[README](torque-test/README.md) of its own. You need the ant tool installed.
+*Torque-test* allows to test against databases and provides a
[README](torque-test/README.md) of its own.
+You need the ant tool installed.
You may start Torque-Test module in the **torque-test folder** by this command
(with default database derbyEmbedded)
@@ -83,7 +85,8 @@ You need the ant tool installed.
N.B. This has to be run from root folder, as torque-site expects existing
target/site folders for each module (torque-test is not included).
-The ant build tool does not (yet) include pmd/xref reports in the final site
building, although they are build for inspection in each sub module (except
test).
+The ant build tool does not (yet) include pmd/xref reports in the final site
building,
+although they are build for inspection in each sub module (except test).
#### Build modules
@@ -148,7 +151,7 @@ and profile apache-release to create the
mvn release:prepare -DautoVersionSubmodules=true
-Ptest,managers,beans,apache-release,derbyEmbedded-jenkins
- mvn release:perform -Pmanagers,beans,apache-release
+ mvn release:perform -Pmanagers,beans,derbyEmbedded-jenkins
Note: We need to add profiles managers, beans as release perform does a
checkout
of the tagged version (which is then uploaded to nexus) and is running the
build process again.
Modified: db/torque/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/pom.xml?rev=1896666&r1=1896665&r2=1896666&view=diff
==============================================================================
--- db/torque/trunk/pom.xml (original)
+++ db/torque/trunk/pom.xml Tue Jan 4 10:25:37 2022
@@ -18,7 +18,8 @@
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";>
+<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>
@@ -445,10 +446,10 @@
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
</dependency>
<!--required for derby 15 / java 11:
dependency>
@@ -478,7 +479,7 @@
<!-- with error
https://issues.apache.org/jira/browse/MPMD-325 and workaround -->
<version>3.15.0</version>
<configuration>
- <linkXref>true</linkXref>
+ <linkXRef>true</linkXRef>
<targetJdk>${maven.compiler.source}</targetJdk>
</configuration>
<dependencies>
@@ -495,14 +496,37 @@
<version>3.1.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ <version>4.5.2.0</version>
+ <configuration>
+
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.3.9</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.15</version>
+ <version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -620,13 +644,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
-
<excludeFilterFile>${basedir}/src/main/plugin-config/findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -697,7 +714,11 @@
</reports>
</reportSet>
</reportSets>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -734,9 +755,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<threshold>Normal</threshold>
</configuration>
@@ -801,6 +821,25 @@
</goals>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.11</version>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <!-- generate only sha for binaries and source
zip/tar files from assembly -->
+ <excludeMainArtifact>true</excludeMainArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>artifacts</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
