Merge branch 'develop-aps-v1.11.4' into stable-aps-v1.11.4

This commit is contained in:
2022-10-03 11:07:05 -04:00

591
pom.xml
View File

@@ -5,17 +5,20 @@
<groupId>com.inteligr8.activiti</groupId> <groupId>com.inteligr8.activiti</groupId>
<artifactId>cxf-activiti-ext</artifactId> <artifactId>cxf-activiti-ext</artifactId>
<version>1.1.0</version> <version>1.1.0-aps-v1.11.4</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS/Activiti</name> <name>CXF-based JAX-RS &amp; JAX-WS enablement for APS v1.11.4</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<aps.cxf.version>${cxf.version}</aps.cxf.version> <!-- 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>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@@ -125,6 +128,55 @@
<artifactId>xmlschema-core</artifactId> <artifactId>xmlschema-core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- ******************** -->
<!-- APS v1.11.4 specific -->
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<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>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@@ -206,13 +258,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<classifier>${aps.app.tag}</classifier>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version> <version>3.3.0</version>
@@ -250,50 +295,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>install-classifier</id>
<phase>install</phase>
<goals><goal>install-file</goal></goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<classifier>jar-with-dependencies-${aps.app.tag}</classifier>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>deploy-classifier</id>
<phase>deploy</phase>
<goals><goal>deploy-file</goal></goals>
<configuration>
<file>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</file>
<repositoryId>inteligr8-releases</repositoryId>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>${project.packaging}</packaging>
<classifier>jar-with-dependencies-${aps.app.tag}</classifier>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>io.repaint.maven</groupId> <groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId> <artifactId>tiles-maven-plugin</artifactId>
@@ -321,472 +322,6 @@
<acs-platform.timeout>1200000</acs-platform.timeout> <acs-platform.timeout>1200000</acs-platform.timeout>
</properties> </properties>
</profile> </profile>
<profile>
<id>aps-v1.11.0</id>
<properties>
<aps.app.tag>aps-v1.11.0</aps.app.tag>
<!-- picked versions -->
<cxf.version>3.1.14</cxf.version> <!-- because it uses provided jackson v2.10.1 -->
<!-- APS provided versions -->
<aps.spring.version>4.3.24.RELEASE</aps.spring.version>
<aps.jackson.version>2.9.10</aps.jackson.version>
</properties>
<dependencies>
<!-- APS v1.11.2 and later provide this library -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
</dependency>
<!-- APS v1.11.2 and later provide this library -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${aps.jaxb-core.version}</version>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/v1.11.1/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</profile>
<profile>
<id>aps-v1.11.1</id>
<properties>
<aps.app.tag>aps-v1.11.1</aps.app.tag>
<!-- picked versions -->
<aps.cxf.version>3.1.14</aps.cxf.version>
<!-- APS provided versions -->
<aps.spring.version>4.3.24.RELEASE</aps.spring.version>
<aps.jackson.version>2.9.10</aps.jackson.version>
</properties>
<dependencies>
<!-- APS v1.11.2 and later provide this library -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${aps.cxf.version}</version>
</dependency>
<!-- APS v1.11.2 and later provide this library -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${aps.jaxb-core.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>aps-v1.11.2</id>
<properties>
<aps.app.tag>aps-v1.11.2</aps.app.tag>
<!-- APS provided versions -->
<aps.cxf.version>3.1.14</aps.cxf.version>
<aps.spring.version>4.3.29.RELEASE</aps.spring.version>
<aps.jackson.version>2.9.10</aps.jackson.version> <!-- of note, cxf v3.1.14 uses jackson 2.10.1 -->
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<id>aps-v1.11.3</id>
<properties>
<aps.app.tag>aps-v1.11.3</aps.app.tag>
<!-- 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.9.10</aps.jackson.version> <!-- of note, cxf v3.1.14 uses jackson 2.10.1 -->
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- APS v1.11.3 and later provided libraries -->
<dependency>
<groupId>org.jacorb</groupId>
<artifactId>jacorb-omgapi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<id>aps-v1.11.4</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<aps.app.tag>aps-v1.11.4</aps.app.tag>
<!-- 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>
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<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>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<profile>
<id>aps-v2.0</id>
<properties>
<aps.app.tag>aps20</aps.app.tag>
<!-- APS provided versions -->
<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>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- APS v1.11.3 and later provided libraries -->
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<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>
</profile>
<profile>
<id>aps-v2.1</id>
<properties>
<aps.app.tag>aps21</aps.app.tag>
<!-- APS provided versions -->
<aps.cxf.version>3.4.4</aps.cxf.version>
<aps.spring.version>5.3.13</aps.spring.version>
<aps.jackson.version>2.12.4</aps.jackson.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- APS v1.11.3 and later provided libraries -->
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<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>
</profile>
<profile>
<id>aps-v2.2</id>
<properties>
<aps.app.tag>aps22</aps.app.tag>
<!-- APS provided versions -->
<aps.cxf.version>3.5.0</aps.cxf.version>
<aps.spring.version>5.3.15</aps.spring.version>
<aps.jackson.version>2.13.1</aps.jackson.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- APS v1.11.3 and later provided libraries -->
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<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>
</profile>
<profile>
<id>aps-v2.3</id>
<properties>
<aps.app.tag>aps23</aps.app.tag>
<!-- APS provided versions -->
<aps.cxf.version>3.5.2</aps.cxf.version>
<aps.spring.version>5.3.20</aps.spring.version>
<aps.jackson.version>2.13.3</aps.jackson.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- APS provided libraries -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
<scope>provided</scope>
</dependency>
<!-- APS v1.11.3 and later provided libraries -->
<dependency>
<groupId>org.jboss.spec.javax.rmi</groupId>
<artifactId>jboss-rmi-api_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<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>
</profile>
<profile> <profile>
<id>ossrh-release</id> <id>ossrh-release</id>
<properties> <properties>
@@ -825,18 +360,4 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
<repositories>
<repository>
<id>alfresco-public</id>
<url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>inteligr8-public</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
</pluginRepository>
</pluginRepositories>
</project> </project>