Dependency updates (CVE fixes)

build-support/checkstyle.xml

@@ -4,6 +4,8 @@
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
 <module name="Checker">
+    <!-- Override the default tab width of 8 so it aligns with standard eclipse formatting. -->
+    <property name="tabWidth" value="4"/>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -28,11 +30,13 @@
         <property name="fileExtensions" value="java"/>
     </module>
 
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
 
     <module name="TreeWalker">
-        <!-- Override the default tab width of 8 so it aligns with standard eclipse formatting. -->
-        <property name="tabWidth" value="4"/>
-
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
@@ -72,12 +76,6 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <!--<module name="MethodLength"/>-->
         <!--<module name="ParameterNumber"/>-->
 

build.gradle

@@ -1,9 +1,10 @@
 buildscript {
 	repositories {
+		mavenCentral()
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
+		classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
 	}
 }
 
@@ -41,8 +42,7 @@ subprojects {
 configure(javaProjects) {
 	apply plugin: 'checkstyle'
 	apply plugin: 'java'
-	apply plugin: 'jdepend'
-	apply plugin: 'maven'
+	apply plugin: 'maven-publish'
 	apply plugin: 'signing'
 	apply plugin: 'com.github.johnrengelman.shadow'
 
@@ -63,7 +63,7 @@ configure(javaProjects) {
 	}
 
 	dependencies {
-		testCompile group: 'junit', name: 'junit', version: dependencyVersionJunit
+		testImplementation group: 'junit', name: 'junit', version: dependencyVersionJunit
 	}
 
 	checkstyle {
@@ -88,7 +88,7 @@ configure(javaProjects) {
 	}
 
 	shadowJar {
-		baseName = project.name
+		archiveBaseName = project.name
 		mergeServiceFiles()
 		transform(com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer) {
 			resource = 'reference.conf'
@@ -102,48 +102,48 @@ configure(javaProjects) {
 		required = Boolean.valueOf(osmosisSigningEnabled)
 	}
 
-	// Configure the maven plugin to upload artefacts to the Sonatype repository.
-	uploadArchives {
-		repositories {
-			mavenDeployer {
-				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-				// We upload to the Sonatype SNAPSHOT repository unless it is a release build in
-				// which case we upload to the staging repository.
-				def sonatypeRepoUrl = "RELEASE".equals(osmosisBuildType) ?
-					'https://oss.sonatype.org/service/local/staging/deploy/maven2/' :
-					'https://oss.sonatype.org/content/repositories/snapshots/'
-				repository(url: sonatypeRepoUrl) {
-					authentication(userName: sonatypeUsername, password: sonatypePassword)
-				}
-
-				pom.project {
-					name project.name
-					packaging 'jar'
-					description 'Osmosis is a Java application and library for processing OSM data.'
-					url 'http://wiki.openstreetmap.org/wiki/Osmosis'
+	// Configure the maven-publish plugin to upload artifacts to the Sonatype repository.
+	publishing {
+		publications {
+			mavenJava(MavenPublication) {
+				pom {
+					name = project.name
+					packaging = 'jar'
+					description = 'Osmosis is a Java application and library for processing OSM data.'
+					url = 'http://wiki.openstreetmap.org/wiki/Osmosis'
 
 					scm {
-						url 'https://github.com/openstreetmap/osmosis'
-						connection 'scm:git:git://github.com/openstreetmap/osmosis.git'
-						developerConnection 'scm:git:ssh://git@github.com/openstreetmap/osmosis.git'
+						connection = 'scm:git:git://github.com/openstreetmap/osmosis.git'
+						developerConnection = 'scm:git:ssh://git@github.com/openstreetmap/osmosis.git'
+						url = 'https://github.com/openstreetmap/osmosis'
 					}
 
 					licenses {
 						license {
-							name 'Public Domain'
+							name = 'Public Domain'
 						}
 					}
 
 					developers {
 						developer {
-							id 'brett'
-							name 'Brett Henderson'
-							email 'brett@bretth.com'
+							id = 'brett'
+							name = 'Brett Henderson'
+							email = 'brett@bretth.com'
 						}
 					}
 				}
 			}
 		}
+		repositories {
+			maven {
+				def releasesRepoUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+				def snapshotsRepoUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+				url = "RELEASE".equals(osmosisBuildType) ? releasesRepoUrl : snapshotsRepoUrl
+				credentials {
+					username sonatypeUsername
+					password sonatypePassword
+				}
+			}
+		}
 	}
 }

gradle.properties

@@ -6,27 +6,28 @@ org.gradle.parallel = true
 org.gradle.configureondemand = true
 
 # 3rd Party Library Versions
-dependencyVersionClassworlds=2.5.2
-dependencyVersionCommonsCodec=1.11
-dependencyVersionCommonsCompress=1.18
-dependencyVersionCommonsIo=2.6
+dependencyVersionClassworlds=2.6.0
+dependencyVersionCommonsCodec=1.15
+dependencyVersionCommonsCompress=1.21
+dependencyVersionCommonsCsv=1.9.0
+dependencyVersionCommonsIo=2.11.0
 # Should we be using Dbcp2?
 dependencyVersionCommonsDbcp=1.4
-dependencyVersionGuava=26.0-jre
+dependencyVersionGuava=31.1-jre
 dependencyVersionJpf=1.5
 # JUnit 5 is available, some re-write required
-dependencyVersionJunit=4.12
-dependencyVersionMySql=8.0.12
+dependencyVersionJunit=4.13.2
+dependencyVersionMySql=8.0.29
 # Need to migrate to Netty 4
 dependencyVersionNetty=3.10.6.Final
 dependencyVersionOsmPbf=1.5.0
-dependencyVersionPostGis=2.2.1
-dependencyVersionPostgreSql=42.2.5
-dependencyVersionProtobuf=3.12.2
-dependencyVersionSpring=5.1.0.RELEASE
-dependencyVersionWoodstoxCore=5.1.0
-dependencyVersionWoodstoxStax2=4.1
-dependencyVersionXerces=2.12.0
+dependencyVersionPostGis=2021.1.0
+dependencyVersionPostgreSql=42.3.5
+dependencyVersionProtobuf=3.20.1
+dependencyVersionSpring=5.3.20
+dependencyVersionWoodstoxCore=6.2.8
+dependencyVersionWoodstoxStax2=4.2.1
+dependencyVersionXerces=2.12.2
 
 # Builds are signed if the osmosisSigningEnabled property is set to true.
 # To enable signing, it is recommended to leave this file untouched and to

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists