Commit 70c01e80 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents e1d122dc d8db88a1

pom.xml

+152 −89
Original line number Diff line number Diff line
@@ -12,17 +12,12 @@ 


	<properties>

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

		<aps.port>8081</aps.port>

		

		<!-- ACS v7.2; see profiles to override for other versions -->

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

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

		<maven.compiler.release>11</maven.compiler.release>

		<alfresco.sdk.version>5.2.0</alfresco.sdk.version>

		<alfresco.platform.version>7.2.0</alfresco.platform.version>

		<cxf.version>3.5.0</cxf.version>

		<jackson.version>2.13.1</jackson.version>

		<alfresco.module.classifier>acs72</alfresco.module.classifier>

		

		<aps.port>8081</aps.port>

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

	</properties>



	<dependencyManagement>
@@ -33,17 +28,36 @@ 
				<version>${alfresco.platform.version}</version>

				<type>pom</type>

				<scope>import</scope>

			</dependency><!--

			</dependency>

		</dependencies>

	</dependencyManagement>



	<dependencies>

		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

			<scope>provided</scope>

			</dependency>-->

		</dependency>

		<dependency>

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

			<artifactId>jackson-jaxrs-json-provider</artifactId>

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

		</dependency>

		<dependency>

			<groupId>org.apache.cxf</groupId>

			<artifactId>cxf-rt-frontend-jaxrs</artifactId>

		</dependency>

		

		<!-- Already provided by ACS -->

		<!--

			We need to specify versions here, unlike when we list these in the 

			dependencyManagement block.  However, that block does not get

			inherited by dependent projects.

		-->

		<dependency>

			<groupId>org.apache.cxf</groupId>

			<artifactId>cxf-core</artifactId>

			<version>${cxf.version}</version> <!-- version is unused/unimportant, but we already have it defined -->

			<scope>provided</scope>

		</dependency>

		<dependency>
@@ -51,29 +65,16 @@ 
			<artifactId>cxf-rt-transports-http</artifactId>

			<scope>provided</scope>

		</dependency>

			<dependency>

				<groupId>jakarta.jws</groupId>

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

				<scope>provided</scope>

			</dependency>

			<dependency>

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

				<artifactId>jakarta.activation</artifactId>

				<scope>provided</scope>

			</dependency>

			<dependency>

				<groupId>jakarta.annotation</groupId>

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

				<scope>provided</scope>

			</dependency>

		<dependency>

			<groupId>com.sun.xml.messaging.saaj</groupId>

			<artifactId>saaj-impl</artifactId>

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

			<scope>provided</scope>

		</dependency>

		<dependency>

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

			<artifactId>geronimo-jta_1.1_spec</artifactId>

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

			<scope>provided</scope>

		</dependency>

		<dependency>
@@ -97,25 +98,6 @@ 
			<scope>provided</scope>

		</dependency>

	</dependencies>

	</dependencyManagement>



	<dependencies>

		<dependency>

			<groupId>org.alfresco</groupId>

			<artifactId>alfresco-repository</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

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

			<artifactId>jackson-jaxrs-json-provider</artifactId>

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

		</dependency>

		<dependency>

			<groupId>org.apache.cxf</groupId>

			<artifactId>cxf-rt-frontend-jaxrs</artifactId>

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

		</dependency>

	</dependencies>



	<build>

		<plugins>
@@ -158,12 +140,6 @@ 
		</profile>

		<profile>

			<id>acs62</id>

			<activation>

				<property>

					<name>acsMinorVersion</name>

					<value>6.2</value>

				</property>

			</activation>

			<properties>

				<maven.compiler.source>8</maven.compiler.source>

				<maven.compiler.target>8</maven.compiler.target>
@@ -173,15 +149,35 @@ 
				<jackson.version>2.9.9</jackson.version>

				<alfresco.module.classifier>acs62</alfresco.module.classifier>

			</properties>

			<dependencies>

				<dependency>

					<groupId>javax.xml.ws</groupId>

					<artifactId>jaxws-api</artifactId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>org.jboss.spec.javax.rmi</groupId>

					<artifactId>jboss-rmi-api_1.0_spec</artifactId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>org.jacorb</groupId>

					<artifactId>jacorb-omgapi</artifactId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

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

					<artifactId>javax.activation</artifactId>

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

					<scope>provided</scope>

				</dependency>

			</dependencies>

		</profile>

		<profile>

			<id>acs70</id>

			<activation>

				<property>

					<name>acsMinorVersion</name>

					<value>7.0</value>

				</property>

			</activation>

			<properties>

				<alfresco.sdk.version>5.0.0</alfresco.sdk.version>

				<alfresco.platform.version>7.0.0</alfresco.platform.version>
@@ -189,15 +185,32 @@ 
				<jackson.version>2.12.1</jackson.version>

				<alfresco.module.classifier>acs70</alfresco.module.classifier>

			</properties>

			<dependencies>

				<dependency>

					<groupId>jakarta.jws</groupId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

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

					<artifactId>jakarta.activation</artifactId>

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>jakarta.annotation</groupId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>org.jboss.spec.javax.rmi</groupId>

					<artifactId>jboss-rmi-api_1.0_spec</artifactId>

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

					<scope>provided</scope>

				</dependency>

			</dependencies>

		</profile>

		<profile>

			<id>acs71</id>

			<activation>

				<property>

					<name>acsMinorVersion</name>

					<value>7.1</value>

				</property>

			</activation>

			<properties>

				<alfresco.sdk.version>5.1.0</alfresco.sdk.version>

				<alfresco.platform.version>7.1.0</alfresco.platform.version>
@@ -205,6 +218,56 @@ 
				<jackson.version>2.12.3</jackson.version>

				<alfresco.module.classifier>acs71</alfresco.module.classifier>

			</properties>

			<dependencies>

				<dependency>

					<groupId>jakarta.jws</groupId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

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

					<artifactId>jakarta.activation</artifactId>

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>jakarta.annotation</groupId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>org.jboss.spec.javax.rmi</groupId>

					<artifactId>jboss-rmi-api_1.0_spec</artifactId>

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

					<scope>provided</scope>

				</dependency>

			</dependencies>

		</profile>

		<profile>

			<id>acs72</id>

			<properties>

				<alfresco.sdk.version>5.2.0</alfresco.sdk.version>

				<alfresco.platform.version>7.2.0</alfresco.platform.version>

				<cxf.version>3.5.0</cxf.version>

				<jackson.version>2.13.1</jackson.version>

				<alfresco.module.classifier>acs72</alfresco.module.classifier>

			</properties>

			<dependencies>

				<dependency>

					<groupId>jakarta.jws</groupId>

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

					<scope>provided</scope>

				</dependency>

				<dependency>

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

					<artifactId>jakarta.activation</artifactId>

					<scope>provided</scope>

				</dependency>

				<dependency>

					<groupId>jakarta.annotation</groupId>

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

					<scope>provided</scope>

				</dependency>

			</dependencies>

		</profile>

	</profiles>