Commit 9a6201ff authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-jersey' into stable-jersey

parents 3633da39 831dc43d
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -48,18 +48,19 @@
		<junit.version>5.7.2</junit.version>
		<spring.version>5.3.6</spring.version>
		<jersey.version>2.39.1</jersey.version>
		<jackson.version>2.15.1</jackson.version>
	</properties>

	<dependencies>
		<dependency>
			<groupId>com.inteligr8</groupId>
			<artifactId>common-rest-client</artifactId>
			<version>2.0.1-jersey</version>
			<version>2.0.4-jersey</version>
		</dependency>
		<dependency>
			<groupId>com.inteligr8.alfresco</groupId>
			<artifactId>acs-public-rest-api</artifactId>
			<version>2.0.1-${acs.platform.tag}</version>
			<version>2.1-SNAPSHOT-${acs.platform.tag}</version>
			<scope>provided</scope> <!-- explicitly, bring your own version -->
		</dependency>
		<dependency>
@@ -92,13 +93,19 @@
			<groupId>org.glassfish.jersey.inject</groupId>
			<artifactId>jersey-hk2</artifactId>
			<version>${jersey.version}</version>
			<scope>test</scope>
			<optional>true</optional>
		</dependency>
		<dependency>
			<groupId>org.glassfish.jersey.media</groupId>
			<artifactId>jersey-media-json-jackson</artifactId>
			<version>${jersey.version}</version>
			<scope>test</scope>
		</dependency>
		
		<!-- Jersey library fallout -->
		<dependency>
			<groupId>com.fasterxml.jackson.core</groupId>
			<artifactId>jackson-annotations</artifactId>
			<version>${jackson.version}</version>
		</dependency>
	</dependencies>