Compare commits

...

52 Commits

Author SHA1 Message Date
f3d0a81fc4 ACS v25.2 2025-08-14 14:16:57 -04:00
23b3fa4203 Merge branch 'develop' into stable 2025-08-14 14:15:20 -04:00
f9b570b23a v1.4.x; due to changes in ACS v25.x 2025-08-14 14:14:25 -04:00
a562b7882f Merge branch 'develop' into stable 2025-08-14 09:28:26 -04:00
73d1fabc41 fix central publishing 2025-08-14 09:27:49 -04:00
bee0a4d17f ACS v25.2.0 pom 2025-08-13 15:21:18 -04:00
426a39043b Merge branch 'develop' into stable 2025-08-13 15:19:32 -04:00
3e189b31d5 nexus-staging to central-publishing 2025-08-13 15:19:10 -04:00
7b762e6c78 ACS v25.1.0 pom 2025-04-08 15:20:46 -04:00
7ada19b8b5 ACS v23.4.1 pom 2025-03-03 10:18:23 -05:00
6215ebe293 ACS v23.3.0 pom 2025-03-03 10:16:28 -05:00
a5aa27f9e9 v1.3.2 pom 2025-03-03 10:14:50 -05:00
a346feb9b4 v1.3.2 and ACS v23.2 pom 2025-03-03 10:13:01 -05:00
af409830ba Merge branch 'develop' into stable 2025-03-03 10:11:35 -05:00
5ee9c00456 common-rest-client v3.0.3-cxf 2025-03-03 10:11:07 -05:00
35ac812899 v1.3.1 pom 2024-10-28 16:07:16 -04:00
771ba441f9 Merge branch 'develop' into stable 2024-10-28 16:06:23 -04:00
975eef5609 added common-rest-client 2024-10-28 16:06:09 -04:00
dece3300ce ACS v23.3.0 pom 2024-10-15 10:01:52 -04:00
986427ddf2 v1.3.0 pom 2024-08-22 10:55:06 -04:00
49e3867bec v1.3.x pom; jakarta support 2024-08-22 10:51:12 -04:00
9edea7fbac acs v7.3.0 2024-08-22 10:27:23 -04:00
f6d395e5ae ACS v23.2.1 pom 2024-08-13 09:59:11 -04:00
5a04b98679 ACS v23.1.0 2024-08-13 09:46:58 -04:00
13ee8c0d8f ACS v7.4.2 pom 2024-06-10 10:58:30 -04:00
8dd0f9a8a1 ACS v7.4.1 pom 2023-08-17 18:08:40 -04:00
c266c470f2 ACS v7.4.0 pom 2023-06-13 12:45:18 -04:00
5a2b9e4b05 ACS v7.3.1 2023-06-13 12:38:33 -04:00
d7861ef90b ACS v7.3.0 2023-06-13 12:22:01 -04:00
cbda8a71b3 v1.2.0-acs-v7.2.1 pom 2023-06-13 12:14:06 -04:00
cdd2640e04 dynamic project desc 2023-06-13 12:13:00 -04:00
746543a3d3 removed specifics from develop branch 2023-06-13 12:07:29 -04:00
860ddc2185 refactored POM for better version matching 2023-06-13 12:06:35 -04:00
5954c6f379 Merge branch 'develop-acs72' into stable-acs72 2022-10-02 17:28:41 -04:00
7212777cae Merge branch 'stable-acs71' into stable-acs72 2022-10-02 17:28:36 -04:00
7a6ff7374b updated project desc 2022-10-02 17:26:19 -04:00
a8e997920d Merge branch 'develop-acs71' into develop-acs72 2022-10-02 17:25:48 -04:00
72c45ca0b0 Merge branch 'develop-acs71' into stable-acs71 2022-10-02 17:24:38 -04:00
e930655b7f updated project desc 2022-10-02 17:23:57 -04:00
ea8e408caa Merge branch 'develop-acs70' into develop-acs71 2022-10-02 17:23:34 -04:00
4c30132ac7 POM to acs72 2022-10-02 17:22:15 -04:00
695cbabb06 Merge branch 'develop-acs62' into develop-acs70 2022-10-02 17:17:16 -04:00
05b7b47caa nexus-staging direct; rather than ext 2022-10-02 17:14:34 -04:00
cd79672eb2 updated project desc 2022-10-02 16:57:21 -04:00
95f11ccb94 Merge branch 'develop-acs62' into develop-acs70 2022-10-02 16:57:02 -04:00
e7e470a46d remove excess; updated project desc 2022-10-02 16:56:50 -04:00
4d4220ff09 Merge branch 'stable-acs70' into stable-acs71 2022-10-02 16:48:35 -04:00
3216ba5f09 Merge branch 'stable-acs62' into stable-acs70 2022-10-02 16:47:57 -04:00
1d72832218 v1.1.0-acs62 pom 2022-10-02 16:44:10 -04:00
817e3f8188 POM to acs71 2022-10-02 16:38:31 -04:00
6acdb3b2cd POM to acs70 2022-10-02 16:35:42 -04:00
9707b08adb classifier to version; acs62 2022-10-02 16:32:55 -04:00
2 changed files with 116 additions and 349 deletions

View File

@@ -1,165 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>cxf-jaxrs-platform-module</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
<description>An Alfresco Content Service module providing the missing components for JAX-RS-based clients.</description>
<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
<licenses>
<license>
<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>
<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
</license>
</licenses>
<scm>
<connection>scm:git:https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module.git</connection>
<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-jaxrs-platform-module.git</developerConnection>
<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
</scm>
<organization>
<name>Inteligr8</name>
<url>https://www.inteligr8.com</url>
</organization>
<developers>
<developer>
<id>brian.long</id>
<name>Brian Long</name>
<email>brian@inteligr8.com</email>
<url>https://twitter.com/brianmlong</url>
</developer>
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<goals><goal>package</goal></goals>
<pom>pom.xml</pom>
<streamLogs>true</streamLogs>
</configuration>
<executions>
<execution>
<id>acs62</id>
<phase>package</phase>
<goals><goal>run</goal></goals>
<configuration>
<profiles><profile>acs62</profile></profiles>
</configuration>
</execution>
<execution>
<id>acs70</id>
<phase>package</phase>
<goals><goal>run</goal></goals>
<configuration>
<profiles><profile>acs70</profile></profiles>
</configuration>
</execution>
<execution>
<id>acs71</id>
<phase>package</phase>
<goals><goal>run</goal></goals>
<configuration>
<profiles><profile>acs71</profile></profiles>
</configuration>
</execution>
<execution>
<id>acs72</id>
<phase>package</phase>
<goals><goal>run</goal></goals>
<configuration>
<profiles><profile>acs72</profile></profiles>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals><goal>attach-artifact</goal></goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-acs62.amp</file>
<classifier>acs62</classifier>
<type>amp</type>
</artifact>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-acs70.amp</file>
<classifier>acs70</classifier>
<type>amp</type>
</artifact>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-acs71.amp</file>
<classifier>acs71</classifier>
<type>amp</type>
</artifact>
<artifact>
<file>${project.build.directory}/${project.artifactId}-${project.version}-acs72.amp</file>
<classifier>acs72</classifier>
<type>amp</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<pomFile>pom.xml</pomFile>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>ossrh-release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign</id>
<phase>verify</phase>
<goals><goal>sign</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

300
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">
<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>
<artifactId>cxf-jaxrs-platform-module</artifactId>
<version>1.1-SNAPSHOT</version>
<version>1.4.0-acs-v${acs.version.major}.${acs.version.minor}</version>
<packaging>jar</packaging>
<name>CXF-based JAX-RS enablement for ACS Platform Module</name>
<description>An Alfresco Content Service module providing the missing components for JAX-RS-based clients.</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}.</description>
<url>https://bitbucket.org/inteligr8/cxf-jaxrs-platform-module</url>
<licenses>
@@ -44,6 +51,8 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<alfresco.sdk.version>5.2.0</alfresco.sdk.version>
<common-rest-client.version>3.0.3-cxf</common-rest-client.version>
<unimportant.version>[1.0.0,)</unimportant.version>
</properties>
@@ -52,10 +61,68 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>${alfresco.platform.version}</version>
<version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}</version>
<type>pom</type>
<scope>import</scope>
</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>
</dependencyManagement>
@@ -64,7 +131,7 @@
All 'provided' dependencies are already provided by ACS OOTB
They are declared here for one of two reasons:
(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>
@@ -73,75 +140,33 @@
<scope>provided</scope>
</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 -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<!-- Included in ACS v25.x+ -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version> <!-- version is unused/unimportant, but we already have it defined -->
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<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>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId>
<version>${common-rest-client.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<classifier>${alfresco.module.classifier}</classifier>
</configuration>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.20</version>
<version>2.40</version>
<extensions>true</extensions>
<configuration>
<tiles>
@@ -170,135 +195,42 @@
</properties>
</profile>
<profile>
<id>acs62</id>
<id>central-publish</id>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<alfresco.sdk.version>4.2.0</alfresco.sdk.version>
<alfresco.platform.version>6.2.0-ga</alfresco.platform.version>
<cxf.version>3.3.2</cxf.version>
<jackson.version>2.9.9</jackson.version>
<alfresco.module.classifier>acs62</alfresco.module.classifier>
<maven.deploy.skip>true</maven.deploy.skip>
</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>
<properties>
<alfresco.sdk.version>5.0.0</alfresco.sdk.version>
<alfresco.platform.version>7.0.0</alfresco.platform.version>
<cxf.version>3.4.2</cxf.version>
<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>
<properties>
<alfresco.sdk.version>5.1.0</alfresco.sdk.version>
<alfresco.platform.version>7.1.0</alfresco.platform.version>
<cxf.version>3.4.4</cxf.version>
<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>
<build>
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
<id>sign</id>
<phase>verify</phase>
<goals><goal>sign</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
<!-- for some reason this is required... -->
<executions>
<execution>
<id>deploy</id>
<phase>deploy</phase>
<goals><goal>publish</goal></goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>