Commit e1293ddf authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 2aed8e55 1261f410

pom.xml

+4 −1
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
		

		<unimportant.version>[1.0.0,)</unimportant.version>

		<license.skip>true</license.skip>



		<!-- Jackson v2.20+ uses a different version number for jackson-annotations -->

		<jackson-annotations.version>2.20</jackson-annotations.version>

	</properties>

	

	<dependencyManagement>
@@ -140,7 +143,7 @@ 
			<dependency>

				<groupId>com.fasterxml.jackson.core</groupId>

				<artifactId>jackson-annotations</artifactId>

				<version>${jackson.version}</version>

				<version>${jackson-annotations.version}</version>

				<scope>provided</scope>

			</dependency>

			<dependency>