Compare commits

...
21 Commits
Author SHA1 Message Date
brian.long 93fe3dbd5c upgraded plugin versions 2026-03-18 16:25:36 -04:00
brian.long 1261f410aa fix jackson-annotations version scheme change 2025-12-23 14:15:22 -05:00
brian.long 0e021bec81 updated URLs 2025-12-23 13:59:24 -05:00
brian.long 9b3691bbd9 fix central publishing 2025-08-14 09:59:31 -04:00
brian.long 507e31ad15 nexus-staging to central-publishing 2025-08-13 15:27:33 -04:00
brian.long 6efe631cb6 jar to pom 2024-10-15 15:20:14 -04:00
brian.long 47def7f9fb v1.3.x 2024-10-15 15:10:00 -04:00
brian.long df90cc36c9 jakarta upgrade to support v24.x+ 2024-10-15 15:09:39 -04:00
brian.long d51309edf9 APS v2.4.1 2023-10-11 11:44:13 -04:00
brian.long 18df7846c4 removed excess spring requirement 2023-06-09 10:45:08 -04:00
brian.long 80c0e87e9a updated to v2.4.0-RC2 2023-06-08 15:01:44 -04:00
brian.long 2458bf3eae skipping license 2023-06-08 14:55:54 -04:00
brian.long 6b6f6e587f removed excess repo 2023-06-08 14:45:55 -04:00
brian.long b8995ea5ed v1.2 pom 2023-06-08 14:41:52 -04:00
brian.long fa2573b91d updated versions for APS v2.3.7 2023-06-07 12:20:08 -04:00
brian.long 63cc84651e Merge branch 'develop-aps22' into develop-aps23 2022-10-03 11:30:29 -04:00
brian.long 1bc21bd57c Merge branch 'develop-acs21' into develop-aps22 2022-10-03 11:28:39 -04:00
brian.long 732f802e30 Merge branch 'develop-aps20' into develop-acs21 2022-10-03 11:27:16 -04:00
brian.long bb4a199c28 updated for APS v2.3.x 2022-10-03 11:14:22 -04:00
brian.long 6775ef724b updated for APS v2.2.x 2022-10-03 11:11:57 -04:00
brian.long 60c89853de updated for APS v2.1.x 2022-10-03 11:09:36 -04:00
2 changed files with 82 additions and 91 deletions
+82 -62
View File
@@ -3,14 +3,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>com.activiti</groupId>
<artifactId>activiti-app-root</artifactId>
<version>24.1.0</version>
</parent>
<groupId>com.inteligr8.activiti</groupId>
<artifactId>cxf-activiti-ext</artifactId>
<version>1.1-SNAPSHOT-aps20</version>
<artifactId>cxf-activiti-app-ext</artifactId>
<version>1.3.SNAPSHOT-aps-v24.1</version>
<packaging>jar</packaging>
<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
<description>An Alfresco Process Service App v2.0.x extension providing the missing components for JAX-RS-based client libraries.</description>
<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
<description>An Alfresco Process Service App extension providing the missing components for JAX-RS-based client libraries.</description>
<url>https://git.inteligr8.com/inteligr8/cxf-activiti-ext</url>
<licenses>
<license>
@@ -20,9 +26,9 @@
</licenses>
<scm>
<connection>scm:git:https://bitbucket.org/inteligr8/cxf-activiti-ext.git</connection>
<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-activiti-ext.git</developerConnection>
<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
<connection>scm:git:https://git.inteligr8.com/inteligr8/cxf-activiti-ext.git</connection>
<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/cxf-activiti-ext.git</developerConnection>
<url>https://git.inteligr8.com/inteligr8/cxf-activiti-ext</url>
</scm>
<organization>
<name>Inteligr8</name>
@@ -42,22 +48,21 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<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>
<unimportant.version>[1.0.0,)</unimportant.version>
<license.skip>true</license.skip>
<!-- Jackson v2.20+ uses a concatenated version number for jackson-annotations -->
<jackson-annotations.version>2.20</jackson-annotations.version>
</properties>
<dependencyManagement>
<!-- versions need to be explicit for central-publishing-maven-plugin -->
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${javax-jaxb.version}</version>
<scope>provided</scope>
</dependency>
@@ -65,11 +70,13 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
@@ -77,11 +84,13 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation.version}</version>
<scope>provided</scope> <!-- v1.11.3 and earlier; exclude in v1.11.4 and later for conflict with jakarta-annotation-api -->
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope> <!-- v1.11.4 and later; exclude in v1.11.3 and earlier for conflict with annotation-api -->
</dependency>
@@ -89,16 +98,19 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
<scope>provided</scope> <!-- v1.11.0 and earlier; exclude in v1.11.1 and later for conflict with jakarta-activation-api -->
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
<version>${javax.activation.version}</version>
<scope>provided</scope> <!-- v1.11.3 and later; exclude in v1.11.2 and earlier for conflict with activation -->
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope> <!-- v1.11.1 and later; exclude in v1.11.2 and earlier for conflict with activation -->
</dependency>
@@ -106,67 +118,80 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${javax-jaxb.version}</version>
<scope>provided</scope> <!-- v1.11.0 and earlier; exclude in v1.11.1 and alter for conflict with jakarta.xml.bind-api -->
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope> <!-- v1.11.3 and later; exclude in v1.11.2 and earlier for conflict with jaxb-api -->
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<!-- ******************** -->
<!-- APS v2.x specific -->
<!-- APS provided libraries -->
<!-- APS/Chemistry provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
@@ -174,66 +199,76 @@
<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>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</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.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${unimportant.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- Package CXF JAX-RS support -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${aps.cxf.version}</version>
<version>${cxf.version}</version>
<scope>runtime</scope>
</dependency>
<!-- Package JackSON JAX-RS support -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${aps.jackson.version}</version>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<!-- Package JackSON XML support -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>${aps.jackson.version}</version>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
<!-- Package JackSON joda-time support -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${aps.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${aps.spring.version}</version>
<version>${jackson.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -252,6 +287,7 @@
<phase>prepare-package</phase>
<goals><goal>unpack-dependencies</goal></goals>
<configuration>
<includeTypes>jar</includeTypes>
<includeScope>runtime</includeScope>
<includes>META-INF/cxf/bus-extensions.txt</includes>
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
@@ -264,7 +300,7 @@
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>merge-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<executions>
<execution>
<id>merge-bus-extensions</id>
@@ -289,7 +325,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>assemble-jar</id>
@@ -327,7 +362,7 @@
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.21</version>
<version>2.41</version>
<extensions>true</extensions>
<configuration>
<tiles>
@@ -352,35 +387,12 @@
</properties>
</profile>
<profile>
<id>ossrh-release</id>
<id>central-publish</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>source</id>
<phase>package</phase>
<goals><goal>jar-no-fork</goal></goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals><goal>jar</goal></goals>
<configuration>
<show>public</show>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
@@ -392,19 +404,20 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
<!-- for some reason this is required... -->
<executions>
<execution>
<id>ossrh-deploy</id>
<id>deploy</id>
<phase>deploy</phase>
<goals><goal>deploy</goal></goals>
<goals><goal>publish</goal></goals>
</execution>
</executions>
</plugin>
@@ -412,4 +425,11 @@
</build>
</profile>
</profiles>
<repositories>
<repository>
<id>activiti-releases</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
</repository>
</repositories>
</project>
@@ -1,29 +0,0 @@
/*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.activiti.extension.conf;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
/**
* A means for injecting packages to scan for the Spring context.
*
* @author brian@inteligr8.com
*/
@Configuration
@ComponentScan(basePackages = "${activiti-ext.scan.packages}")
public class CxfActivitiExtSpringComponentScanner {
}