Compare commits

..

13 Commits

177
pom.xml
View File

@@ -4,13 +4,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>25.2.0</version>
<relativePath></relativePath>
</parent>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>cxf-jaxrs-platform-module</artifactId> <artifactId>cxf-jaxrs-platform-module</artifactId>
<version>1.1-SNAPSHOT-acs71</version> <version>1.4-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CXF-based JAX-RS enablement for ACS Platform Module</name> <name>CXF-based JAX-RS enablement for ACS Platform Module</name>
<description>An Alfresco Content Service v7.1.x module providing the missing components for JAX-RS-based client libraries.</description> <description>An Alfresco Content Service Platform module providing the missing components for JAX-RS-based client libraries in ACS v${acs.version.major}.${acs.version.minor}.${acs.version.revision}.</description>
<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url> <url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
<licenses> <licenses>
@@ -44,12 +51,9 @@
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release> <maven.compiler.release>11</maven.compiler.release>
<alfresco.sdk.version>5.1.0</alfresco.sdk.version> <alfresco.sdk.version>5.2.0</alfresco.sdk.version>
<alfresco.platform.version>7.1.0</alfresco.platform.version> <common-rest-client.version>3.0.3-cxf</common-rest-client.version>
<cxf.version>3.4.4</cxf.version>
<jackson.version>2.12.3</jackson.version>
<unimportant.version>[1.0.0,)</unimportant.version> <unimportant.version>[1.0.0,)</unimportant.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@@ -57,10 +61,68 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId> <artifactId>acs-community-packaging</artifactId>
<version>${alfresco.platform.version}</version> <version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- Provided by ACS -->
<!-- versions need to be explicit for central-publishing-maven-plugin -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${dependency.cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${dependency.cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${dependency.jackson.version}</version>
<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>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>${dependency.jakarta-jws-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<!-- unimportant.version tries to download a milestone release that doesn't exist -->
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${dependency.jakarta-ee-activation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${dependency.jakarta-annotation-api.version}</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@@ -69,7 +131,7 @@
All 'provided' dependencies are already provided by ACS OOTB All 'provided' dependencies are already provided by ACS OOTB
They are declared here for one of two reasons: They are declared here for one of two reasons:
(1) Prevent dependencies of other non-provided depenencies from being included (1) Prevent dependencies of other non-provided depenencies from being included
(2) Prevent projects depending on this project from including these dupilcate libraries (2) Prevent projects depending on this project from including these duplicate libraries
--> -->
<dependency> <dependency>
@@ -78,82 +140,24 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- Version managed by acs-community-packaging, yet not included by ACS --> <!-- Version managed by acs-community-packaging, yet not included by ACS -->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId> <artifactId>cxf-rt-rs-client</artifactId>
</dependency> </dependency>
<!-- Included in ACS v25.x+ -->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>cxf-core</artifactId> <artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${cxf.version}</version> <!-- version is unused/unimportant, but we already have it defined --> <version>${dependency.jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</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>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.jws</groupId> <groupId>com.inteligr8</groupId>
<artifactId>jakarta.jws-api</artifactId> <artifactId>common-rest-client</artifactId>
<scope>provided</scope> <version>${common-rest-client.version}</version>
</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> </dependency>
</dependencies> </dependencies>
@@ -162,7 +166,7 @@
<plugin> <plugin>
<groupId>io.repaint.maven</groupId> <groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId> <artifactId>tiles-maven-plugin</artifactId>
<version>2.20</version> <version>2.40</version>
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<tiles> <tiles>
@@ -191,7 +195,7 @@
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>ossrh-release</id> <id>central-publish</id>
<properties> <properties>
<maven.deploy.skip>true</maven.deploy.skip> <maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
@@ -208,19 +212,20 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.central</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>central-publishing-maven-plugin</artifactId>
<version>1.6.13</version> <version>0.8.0</version>
<extensions>true</extensions>
<configuration> <configuration>
<serverId>ossrh</serverId> <publishingServerId>central</publishingServerId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> <autoPublish>true</autoPublish>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration> </configuration>
<!-- for some reason this is required... -->
<executions> <executions>
<execution> <execution>
<id>ossrh-deploy</id> <id>deploy</id>
<phase>deploy</phase> <phase>deploy</phase>
<goals><goal>deploy</goal></goals> <goals><goal>publish</goal></goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>