Skip to content

Commit

Permalink
maven wrapper 3.9.6, dependency/plugin updates and other stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@glhez
glhez committed Dec 10, 2023
1 parent f352c18 commit 1492a2c
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 234 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ jobs:
- name: build
run: |
./mvnw -B package
cat "$HOME/.m2/toolchains.xml"
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
227 changes: 65 additions & 162 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,82 +81,82 @@
<!--
Versions of dependencies; may be used later (such as in plugin/dependencies since)
-->
<dep.junit-bom.version>5.10.0</dep.junit-bom.version>
<dep.mockito-core.version>5.5.0</dep.mockito-core.version>
<dep.junit-bom.version>5.10.1</dep.junit-bom.version>
<dep.mockito-core.version>5.8.0</dep.mockito-core.version>
<dep.assertj-core.version>3.24.2</dep.assertj-core.version>
<dep.memoryfilesystem.version>2.6.1</dep.memoryfilesystem.version>
<dep.log4j-bom.version>2.20.0</dep.log4j-bom.version>
<dep.commons-lang3.version>3.13.0</dep.commons-lang3.version>
<dep.commons-text.version>1.10.0</dep.commons-text.version>
<dep.memoryfilesystem.version>2.7.0</dep.memoryfilesystem.version>
<dep.log4j-bom.version>2.22.0</dep.log4j-bom.version>
<dep.commons-lang3.version>3.14.0</dep.commons-lang3.version>
<dep.commons-text.version>1.11.0</dep.commons-text.version>
<dep.commons-csv.version>1.10.0</dep.commons-csv.version>
<dep.guava.version>32.1.2-jre</dep.guava.version>
<dep.config.version>1.4.2</dep.config.version>
<dep.picocli.version>4.7.4</dep.picocli.version>
<dep.picocli-codegen.version>4.7.4</dep.picocli-codegen.version>
<dep.asm.version>9.5</dep.asm.version>
<dep.asm-util.version>9.5</dep.asm-util.version>
<dep.guava.version>32.1.3-jre</dep.guava.version>
<dep.config.version>1.4.3</dep.config.version>
<dep.picocli.version>4.7.5</dep.picocli.version>
<dep.picocli-codegen.version>4.7.5</dep.picocli-codegen.version>
<dep.asm.version>9.6</dep.asm.version>
<dep.asm-util.version>9.6</dep.asm-util.version>
<dep.cfr.version>0.152</dep.cfr.version>
<dep.jansi.version>2.4.0</dep.jansi.version>
<dep.json-unit.version>3.0.0</dep.json-unit.version>
<dep.jansi.version>2.4.1</dep.jansi.version>
<dep.json-unit.version>3.2.2</dep.json-unit.version>
<dep.xmlunit.version>2.9.1</dep.xmlunit.version>

<dep.jmh.version>1.35</dep.jmh.version>
<dep.jmh-core.version>1.37</dep.jmh-core.version>
<dep.jmh-generator-annprocess.version>1.37</dep.jmh-generator-annprocess.version>

<dep.bouncycastle.version>1.76</dep.bouncycastle.version>
<dep.bcprov-jdk18on.version>${dep.bouncycastle.version}</dep.bcprov-jdk18on.version>
<dep.bcprov-ext-jdk18on.version>${dep.bouncycastle.version}</dep.bcprov-ext-jdk18on.version>
<dep.bcpkix-jdk18on.version>${dep.bouncycastle.version}</dep.bcpkix-jdk18on.version>
<dep.bcmail-jdk18on.version>${dep.bouncycastle.version}</dep.bcmail-jdk18on.version>
<dep.bcpg-jdk18on.version>${dep.bouncycastle.version}</dep.bcpg-jdk18on.version>
<dep.bctls-jdk18on.version>${dep.bouncycastle.version}</dep.bctls-jdk18on.version>
<dep.bcprov-debug-jdk18on.version>${dep.bouncycastle.version}</dep.bcprov-debug-jdk18on.version>
<dep.bcprov-ext-debug-jdk18on.version>${dep.bouncycastle.version}</dep.bcprov-ext-debug-jdk18on.version>
<dep.saxon-he.version>12.3</dep.saxon-he.version>
<dep.bcprov-jdk18on.version>1.77</dep.bcprov-jdk18on.version>
<dep.bcprov-ext-jdk18on.version>1.77</dep.bcprov-ext-jdk18on.version>
<dep.bcpkix-jdk18on.version>1.77</dep.bcpkix-jdk18on.version>
<dep.bcmail-jdk18on.version>1.77</dep.bcmail-jdk18on.version>
<dep.bcpg-jdk18on.version>1.77</dep.bcpg-jdk18on.version>
<dep.bctls-jdk18on.version>1.77</dep.bctls-jdk18on.version>
<dep.bcprov-debug-jdk18on.version>1.77</dep.bcprov-debug-jdk18on.version>
<dep.bcprov-ext-debug-jdk18on.version>1.77</dep.bcprov-ext-debug-jdk18on.version>
<dep.saxon-he.version>12.4</dep.saxon-he.version>
<dep.freemarker.version>2.3.32</dep.freemarker.version>
<dep.jakarta-jaxb.version>4.0.0</dep.jakarta-jaxb.version>
<dep.jaxb-impl.version>4.0.3</dep.jaxb-impl.version>
<dep.jackson.version>2.15.2</dep.jackson.version>
<dep.bson4jackson.version>2.13.1</dep.bson4jackson.version>
<dep.jna.version>5.13.0</dep.jna.version>
<dep.javacc.version>7.0.12</dep.javacc.version>
<dep.error-prone.version>2.21.1</dep.error-prone.version>
<dep.nullaway.version>0.10.12</dep.nullaway.version>
<dep.jakarta-jaxb.version>4.0.1</dep.jakarta-jaxb.version>
<dep.jaxb-impl.version>4.0.4</dep.jaxb-impl.version>
<dep.jackson.version>2.16.0</dep.jackson.version>
<dep.bson4jackson.version>2.15.0</dep.bson4jackson.version>
<dep.jna.version>5.14.0</dep.jna.version>
<dep.javacc.version>7.0.13</dep.javacc.version>
<dep.error-prone.version>2.23.0</dep.error-prone.version>
<dep.nullaway.version>0.10.18</dep.nullaway.version>

<plg.formatter.version>2.23.0</plg.formatter.version>
<plg.antrun.version>3.1.0</plg.antrun.version>
<plg.appassembler.version>2.1.0</plg.appassembler.version>
<plg.assembly.version>3.6.0</plg.assembly.version>
<plg.assertj-assertions-generator.version>2.2.0</plg.assertj-assertions-generator.version>
<plg.build-helper.version>3.4.0</plg.build-helper.version>
<plg.clean.version>3.3.1</plg.clean.version>
<plg.build-helper.version>3.5.0</plg.build-helper.version>
<plg.clean.version>3.3.2</plg.clean.version>
<plg.compiler.version>3.11.0</plg.compiler.version>
<plg.dependency.version>3.6.0</plg.dependency.version>
<plg.dependency.version>3.6.1</plg.dependency.version>
<plg.deploy.version>3.1.1</plg.deploy.version>
<plg.editorconfig.version>0.1.3</plg.editorconfig.version>
<plg.enforcer.version>3.3.0</plg.enforcer.version>
<plg.exec.version>3.1.0</plg.exec.version>
<plg.failsafe.version>3.1.2</plg.failsafe.version>
<plg.git-commit-id.version>6.0.0</plg.git-commit-id.version>
<plg.enforcer.version>3.4.1</plg.enforcer.version>
<plg.exec.version>3.1.1</plg.exec.version>
<plg.failsafe.version>3.2.2</plg.failsafe.version>
<plg.git-commit-id.version>7.0.0</plg.git-commit-id.version>
<plg.gpg.version>3.1.0</plg.gpg.version>
<plg.install.version>3.1.1</plg.install.version>
<plg.jacoco.version>0.8.10</plg.jacoco.version>
<plg.jacoco.version>0.8.11</plg.jacoco.version>
<plg.jar.version>3.3.0</plg.jar.version>
<plg.javacc.version>3.0.3</plg.javacc.version>
<plg.javadoc.version>3.5.0</plg.javadoc.version>
<plg.jxr.version>3.3.0</plg.jxr.version>
<plg.project-info-reports.version>3.4.5</plg.project-info-reports.version>
<plg.javadoc.version>3.6.3</plg.javadoc.version>
<plg.jxr.version>3.3.1</plg.jxr.version>
<plg.project-info-reports.version>3.5.0</plg.project-info-reports.version>
<plg.release.version>3.0.1</plg.release.version>
<plg.resources.version>3.3.1</plg.resources.version>
<plg.scm.version>2.0.1</plg.scm.version>
<plg.shade.version>3.5.0</plg.shade.version>
<plg.shade.version>3.5.1</plg.shade.version>
<plg.site.version>4.0.0-M9</plg.site.version>
<plg.source.version>3.3.0</plg.source.version>
<plg.surefire-report.version>3.1.2</plg.surefire-report.version>
<plg.surefire.version>3.1.2</plg.surefire.version>
<plg.surefire-report.version>3.2.2</plg.surefire-report.version>
<plg.surefire.version>3.2.2</plg.surefire.version>
<plg.toolchains.version>3.1.0</plg.toolchains.version>
<plg.versions.version>2.16.0</plg.versions.version>
<plg.versions.version>2.16.2</plg.versions.version>
<plg.xml.version>1.1.0</plg.xml.version>
</properties>

Expand Down Expand Up @@ -255,7 +255,6 @@
<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>${plg.appassembler.version}</version> </plugin>
<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>${plg.build-helper.version}</version> </plugin>
<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>${plg.exec.version}</version> </plugin>
<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${plg.versions.version}</version> </plugin>
<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>xml-maven-plugin</artifactId> <version>${plg.xml.version}</version> </plugin>
<plugin> <groupId>org.ec4j.maven</groupId> <artifactId>editorconfig-maven-plugin</artifactId> <version>${plg.editorconfig.version}</version> </plugin>
<plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <version>${plg.jacoco.version}</version> </plugin>
Expand All @@ -282,6 +281,19 @@
</includes>
</configuration>
</plugin>

<plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${plg.versions.version}</version>
<configuration>
<ruleSet>
<ignoreVersions>
<ignoreVersion> <type>regex</type> <version>(?i).*([bM][0-9]+|alpha|beta).*</version> </ignoreVersion>
<ignoreVersion> <type>regex</type> <version>(?i).*(cr|rc|pr)[0-9]*(-android|)</version> </ignoreVersion>
<ignoreVersion> <type>regex</type> <version>(?i).*incubating</version> </ignoreVersion>
<ignoreVersion> <type>regex</type> <version>.*-PFD</version> </ignoreVersion>
</ignoreVersions>
</ruleSet>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -346,11 +358,11 @@
<goals> <goal>revision</goal> </goals>
<phase>initialize</phase>
<configuration>
<dotGitDirectory>${session.executionRootDirectory}/.git</dotGitDirectory>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
<skipPoms>true</skipPoms>
<useNativeGit>true</useNativeGit>
<includeOnlyProperties>
<includeOnlyProperty>^\Qgit.commit.id\E$</includeOnlyProperty>
<includeOnlyProperty>^\Qgit.commit.id.full\E$</includeOnlyProperty>
Expand Down Expand Up @@ -415,36 +427,21 @@
<tagClass>
<displayName>FIXME Work</displayName>
<tags>
<tag>
<matchString>fixme</matchString>
<matchType>ignoreCase</matchType>
</tag>
<tag>
<matchString>@fixme</matchString>
<matchType>ignoreCase</matchType>
</tag>
<tag> <matchString>fixme</matchString> <matchType>ignoreCase</matchType> </tag>
<tag> <matchString>@fixme</matchString> <matchType>ignoreCase</matchType> </tag>
</tags>
</tagClass>
<tagClass>
<displayName>Todo Work</displayName>
<tags>
<tag>
<matchString>todo</matchString>
<matchType>ignoreCase</matchType>
</tag>
<tag>
<matchString>@todo</matchString>
<matchType>ignoreCase</matchType>
</tag>
<tag> <matchString>todo</matchString> <matchType>ignoreCase</matchType> </tag>
<tag> <matchString>@todo</matchString> <matchType>ignoreCase</matchType> </tag>
</tags>
</tagClass>
<tagClass>
<displayName>Deprecated Work</displayName>
<tags>
<tag>
<matchString>@deprecated</matchString>
<matchType>ignoreCase</matchType>
</tag>
<tag> <matchString>@deprecated</matchString> <matchType>ignoreCase</matchType> </tag>
</tags>
</tagClass>
</tagClasses>
Expand Down Expand Up @@ -490,71 +487,6 @@
</reporting>

<profiles>
<!--
versions-maven-plugin settings

The settings will not work without a 'clean install' first because the rules XML file are loaded
using a JAR rather than file. Using a file:// rather than a classpath:// is complex by itself for
this reactor because we can't apply it to each submodule without resorting to some trick such as
creating a dummy file and testing for its existence in each module directory.

-->
<profile>
<id>versions-common-dependency</id>
<activation>
<file> <missing>${basedir}/settings/pom.xml</missing> </file>
</activation>
<properties>
<version.baseURI>classpath://</version.baseURI>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<dependencies>
<dependency> <groupId>com.github.glhez.parent</groupId> <artifactId>settings</artifactId> <version>73-SNAPSHOT</version> </dependency>
</dependencies>
<configuration>
<rulesUri>${version.baseURI}${version.rules.current}</rulesUri>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

<profile>
<id>versions-common-root</id>
<activation>
<file> <exists>${basedir}/settings/pom.xml</exists> </file>
</activation>
<properties>
<version.baseURI>file:${session.executionRootDirectory}/settings</version.baseURI>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<configuration>
<rulesUri>${version.baseURI}${version.rules.current}</rulesUri>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

<profile>
<id>versions-all</id>
<properties>
<version.rules.current>${version.rules.all}</version.rules.current>
</properties>
</profile>

<!--
Codestyle checks

Expand Down Expand Up @@ -644,34 +576,5 @@
</plugins>
</build>
</profile>

<!--
Travis does not support maven-toolchain-plugin, or rather won't have more than one toolchain: having
several JDK defined in .travis.yml will only create one more docker instance rather than using the same
instance with two JDK installed.

- travis-usurper will enable the toolchain check by setting its phase to validate.
- travis-common will disable the toolchain check. It is expected that the child module add the following
activation for each supported JDK

JDK8 [oraclejdk8]
<activation> <property> <name>env.TRAVIS</name> </property> <jdk>1.8</jdk> </activation>

JDK11 [openjdk11]
<activation> <property> <name>env.TRAVIS</name> </property> <jdk>11</jdk> </activation>

-->
<profile>
<id>travis-common</id>
<activation> <property> <name>env.TRAVIS</name> </property> </activation>
<properties> <toolchain.phase>none</toolchain.phase> </properties>
</profile>

<profile>
<id>github-common</id>
<activation> <property> <name>env.GITHUB_ACTION</name> </property> </activation>
<properties> <toolchain.phase>none</toolchain.phase> </properties>
</profile>

</profiles>
</project>
15 changes: 0 additions & 15 deletions settings/version-rules/all.xml
View file

This file was deleted.

Loading

0 comments on commit 1492a2c

Please sign in to comment.