Skip to content

Commit

Permalink
Bump: Minor: JUnit, Mockito, CheckStyle, Pitest, Maven Wrapper, Site …
Browse files Browse the repository at this point in the history
…plugin
  • Loading branch information
inkarkat committed May 27, 2024
1 parent 9605ff6 commit 9376186
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.1
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
2 changes: 1 addition & 1 deletion configs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<!-- project version -->
<revision>1.2.1</revision>
<revision>1.2.2</revision>
<changelist>-SNAPSHOT</changelist>
</properties>

Expand Down
17 changes: 13 additions & 4 deletions mvnw
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.1
# Apache Maven Wrapper startup batch script, version 3.3.2
#
# Optional ENV vars
# -----------------
Expand Down Expand Up @@ -97,11 +97,19 @@ die() {
exit 1
}

trim() {
# MWRAPPER-139:
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
# Needed for removing poorly interpreted newline sequences when running in more
# exotic environments such as mingw bash on Windows.
printf "%s" "${1}" | tr -d '[:space:]'
}

# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
while IFS="=" read -r key value; do
case "${key-}" in
distributionUrl) distributionUrl="${value-}" ;;
distributionSha256Sum) distributionSha256Sum="${value-}" ;;
distributionUrl) distributionUrl=$(trim "${value-}") ;;
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
esac
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
Expand Down Expand Up @@ -131,7 +139,8 @@ esac
distributionUrlName="${distributionUrl##*/}"
distributionUrlNameMain="${distributionUrlName%.*}"
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
MAVEN_HOME="$HOME/.m2/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"

exec_maven() {
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
Expand Down
5 changes: 4 additions & 1 deletion mvnw.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@REM ----------------------------------------------------------------------------

@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.1
@REM Apache Maven Wrapper startup batch script, version 3.3.2
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
Expand Down Expand Up @@ -79,6 +79,9 @@ if ($env:MVNW_REPOURL) {
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
if ($env:MAVEN_USER_HOME) {
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
}
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"

Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

<properties>
<!-- project version -->
<revision>1.2.1</revision>
<revision>1.2.2</revision>
<changelist>-SNAPSHOT</changelist>
<!-- dependencyManagement versions -->
<jetbrains-annotations.version>24.1.0</jetbrains-annotations.version>
<spotbugs-annotations.version>4.8.5</spotbugs-annotations.version>
<hamcrest.version>2.2</hamcrest.version>
<junit.version>5.11.0-M1</junit.version>
<mockito.version>5.11.0</mockito.version>
<junit.version>5.11.0-M2</junit.version>
<mockito.version>5.12.0</mockito.version>
<!-- pluginManagement -->
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
Expand All @@ -40,14 +40,14 @@
<pmd-java.version>7.1.0</pmd-java.version>
<spotbugs-maven-plugin.version>4.8.5.0</spotbugs-maven-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<checkstyle.version>10.16.0</checkstyle.version>
<checkstyle.version>10.17.0</checkstyle.version>
<maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
<maven-jxr-plugin.version>3.3.2</maven-jxr-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<pitest-maven.version>1.16.0</pitest-maven.version>
<pitest-maven.version>1.16.1</pitest-maven.version>
<pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<maven-wrapper.version>3.3.1</maven-wrapper.version>
<maven-wrapper.version>3.3.2</maven-wrapper.version>
</properties>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions versions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<!-- project version -->
<revision>1.2.1</revision>
<revision>1.2.2</revision>
<changelist>-SNAPSHOT</changelist>
<!-- project settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -35,7 +35,7 @@
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
<maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
<maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
<maven-site-plugin.version>4.0.0-M14</maven-site-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
</properties>

Expand Down

0 comments on commit 9376186

Please sign in to comment.