Commit 5ca38481 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-aps20' into stable-aps20

parents 90e18e49 98cbf4df

pom.xml

+22 −20
Original line number Diff line number Diff line
@@ -5,20 +5,19 @@ 
	

	<groupId>com.inteligr8.activiti</groupId>

	<artifactId>cxf-activiti-ext</artifactId>

	<version>1.1.0-aps-v1.11.4</version>

	<version>1.1.0-aps20</version>

	<packaging>jar</packaging>

	

	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS v1.11.4</name>

	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS v2.0.x</name>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<maven.compiler.source>11</maven.compiler.source>

		<maven.compiler.target>11</maven.compiler.target>

		

		<!-- APS provided versions -->

		<aps.cxf.version>3.3.8</aps.cxf.version>

		<aps.spring.version>4.3.30.RELEASE</aps.spring.version>

		<aps.jackson.version>2.12.3</aps.jackson.version>

		<aps.cxf.version>3.4.4</aps.cxf.version>

		<aps.spring.version>5.3.9</aps.spring.version>

		<aps.jackson.version>2.12.4</aps.jackson.version>

	</properties>

	

	<dependencyManagement>
@@ -130,7 +129,7 @@ 
			</dependency>

			

			<!-- ******************** -->

			<!-- APS v1.11.4 specific -->

			<!-- APS v2.0.x specific -->



			<!-- APS provided libraries -->

			<dependency>
@@ -144,18 +143,6 @@ 
				<scope>provided</scope>

			</dependency>

			

			<!-- APS v1.11.3-v1.11.4 provided libraries -->

			<dependency>

				<groupId>org.jacorb</groupId>

				<artifactId>jacorb-omgapi</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>org.apache.geronimo.specs</groupId>

				<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>

				<scope>provided</scope>

			</dependency>

			

			<!-- APS v1.11.3 and later provided libraries -->

			<dependency>

				<groupId>org.jboss.spec.javax.rmi</groupId>
@@ -177,6 +164,21 @@ 
				<artifactId>saaj-impl</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>jakarta.jws</groupId>

				<artifactId>jakarta.jws-api</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>jakarta.xml.soap</groupId>

				<artifactId>jakarta.xml.soap-api</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>com.sun.activation</groupId>

				<artifactId>jakarta.activation</artifactId>

				<scope>provided</scope>

			</dependency>

		</dependencies>

	</dependencyManagement>