Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Dec 15, 2022
2 parents b36079d + 5774c80 commit 3a337eb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 12 deletions.
9 changes: 9 additions & 0 deletions changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
<body>

<release version="48" date="2022-12-15">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
</action>
<action type="update" dev="trichter">
Update com.jcraft:jsch to 0.1.55 for jgitflow-maven-plugin in order to support stronger cryptographic standards.
</action>
</release>

<release version="47" date="2022-09-30">
<action type="update" dev="sseifert">
Update plugins and dependencies to latest versions.
Expand Down
31 changes: 19 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.global-parent</artifactId>
<version>47</version>
<version>48</version>
<packaging>pom</packaging>

<name>io.wcm.maven.global-parent</name>
Expand Down Expand Up @@ -94,12 +94,12 @@

<!-- Plugin version -->
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-release-plugin.version>3.0.0-M6</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.2.0</spotbugs-plugin.version>
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
<spotbugs-plugin.version>4.7.3.0</spotbugs-plugin.version>
<spotbugs-findsecbugs-plugin.version>1.12.0</spotbugs-findsecbugs-plugin.version>
<pmd.version>6.49.0</pmd.version>
<pmd.version>6.52.0</pmd.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<versions-maven-plugin.version>2.11.0</versions-maven-plugin.version>
<versions-maven-plugin.version>2.13.0</versions-maven-plugin.version>

<!-- Set to 'enabled' to activate org.eclipse.jdt.core.compiler.annotation.nullanalysis feature in eclipse settings -->
<eclipse.settings.nullanalysis>disabled</eclipse.settings.nullanalysis>
Expand All @@ -120,7 +120,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
<version>23.1.0</version>
</dependency>

<!--
Expand All @@ -131,7 +131,7 @@
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>4.7.2</version>
<version>4.7.3</version>
<exclusions>
<!-- Do not include JSR-305 annotations - the standard never got accepted, use the nullability annotations from Jetbrains instead -->
<exclusion>
Expand Down Expand Up @@ -429,7 +429,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -554,7 +554,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -665,13 +665,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>2.0.0-M2</version>
<version>2.0.0-M3</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -843,7 +843,7 @@
<plugin>
<groupId>com.amashchenko.maven.plugin</groupId>
<artifactId>gitflow-maven-plugin</artifactId>
<version>1.18.0</version>
<version>1.19.0</version>
<configuration>
<versionsMavenPluginVersion>${versions-maven-plugin.version}</versionsMavenPluginVersion>
<skipTestProject>${gitflow.skipTestProject}</skipTestProject>
Expand Down Expand Up @@ -873,6 +873,13 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<eol>lf</eol>
</configuration>
<dependencies>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>
</dependencies>
</plugin>

</plugins>
Expand Down

0 comments on commit 3a337eb

Please sign in to comment.