Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e33ae887bd | ||
|
|
c2cbcc330a | ||
|
|
1a0236bf9c | ||
|
|
5ca384814f | ||
|
|
90e18e49b2 | ||
|
|
0e0715719a | ||
|
|
fc18b8ad06 | ||
|
|
5a156a6c3e | ||
|
|
9001cdac4d | ||
|
|
efb8641c8f | ||
|
|
a8811183ed | ||
|
|
703fbdfae1 |
@@ -1,7 +1,6 @@
|
|||||||
# Maven
|
# Maven
|
||||||
pom.xml.versionsBackup
|
pom.xml.versionsBackup
|
||||||
target
|
target
|
||||||
*-pom.xml
|
|
||||||
|
|
||||||
# Eclipse
|
# Eclipse
|
||||||
.project
|
.project
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
<extensions
|
|
||||||
xmlns="http://maven.apache.org/EXTENSIONS/1.1.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.1.0 https://maven.apache.org/xsd/core-extensions-1.1.0.xsd">
|
|
||||||
<extension>
|
|
||||||
<groupId>com.inteligr8</groupId>
|
|
||||||
<artifactId>provided-scope-maven-extension</artifactId>
|
|
||||||
<version>1.0.1</version>
|
|
||||||
</extension>
|
|
||||||
</extensions>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo "Configuring the next version ..."
|
|
||||||
CURRENT_FULL_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=project.version`
|
|
||||||
echo "Detected the current version: ${CURRENT_FULL_VERSION}"
|
|
||||||
CURRENT_MINOR_VERSION=`echo "${CURRENT_FULL_VERSION}" | sed 's~^\([^\.]\+\.[^\.\-]\+\).*~\1~'`
|
|
||||||
echo "Computed the current minor version: ${CURRENT_MINOR_VERSION}"
|
|
||||||
|
|
||||||
CURRENT_APS_MAJOR_VERSION=`mvn help:evaluate -q -DforceStdout -Dexpression=aps.majorVersion`
|
|
||||||
echo "Detected the current APS major version: ${CURRENT_APS_MAJOR_VERSION}"
|
|
||||||
|
|
||||||
set +e
|
|
||||||
LATEST_SERVICE_VERSION=`git ls-remote --tags --refs --sort=-v:refname origin v${CURRENT_MINOR_VERSION}*-aps-v${CURRENT_APS_MAJOR_VERSION} | grep refs/tags | head -n1 | sed "s~.\+refs/tags/v${CURRENT_MINOR_VERSION}\.\([^\.\-]\+\).*~\1~"`
|
|
||||||
set -e
|
|
||||||
echo "Detected the latest service version in Git for the minor version: ${CURRENT_MINOR_VERSION}.#-aps-v${CURRENT_APS_MAJOR_VERSION} => ${LATEST_SERVICE_VERSION}"
|
|
||||||
if [[ -z ${LATEST_SERVICE_VERSION} ]]; then
|
|
||||||
LATEST_SERVICE_VERSION=-1
|
|
||||||
fi
|
|
||||||
NEXT_FULL_VERSION="${CURRENT_MINOR_VERSION}.$((LATEST_SERVICE_VERSION + 1))-aps-v${CURRENT_APS_MAJOR_VERSION}"
|
|
||||||
echo "Computed the next version: ${NEXT_FULL_VERSION}"
|
|
||||||
|
|
||||||
mvn versions:set -DnewVersion=${NEXT_FULL_VERSION}
|
|
||||||
@@ -4,13 +4,13 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>com.inteligr8.activiti</groupId>
|
<groupId>com.inteligr8.activiti</groupId>
|
||||||
<artifactId>cxf-activiti-app-ext</artifactId>
|
<artifactId>cxf-activiti-ext</artifactId>
|
||||||
<version>1.4-SNAPSHOT</version>
|
<version>1.1.0-aps22</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>CXF-based JAX-RS & JAX-WS enablement for APS App</name>
|
<name>CXF-based JAX-RS & JAX-WS enablement for APS App</name>
|
||||||
<description>An Alfresco Process Service App extension providing the missing components for JAX-RS-based client libraries.</description>
|
<description>An Alfresco Process Service App v2.2.x extension providing the missing components for JAX-RS-based client libraries.</description>
|
||||||
<url>https://git.inteligr8.com/inteligr8/cxf-activiti-app-ext</url>
|
<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
@@ -20,9 +20,9 @@
|
|||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:https://git.inteligr8.com/inteligr8/cxf-activiti-app-ext.git</connection>
|
<connection>scm:git:https://bitbucket.org/inteligr8/cxf-activiti-ext.git</connection>
|
||||||
<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/cxf-activiti-app-ext.git</developerConnection>
|
<developerConnection>scm:git:git@bitbucket.org:inteligr8/cxf-activiti-ext.git</developerConnection>
|
||||||
<url>https://git.inteligr8.com/inteligr8/cxf-activiti-app-ext</url>
|
<url>https://bitbucket.org/inteligr8/cxf-activiti-ext</url>
|
||||||
</scm>
|
</scm>
|
||||||
<organization>
|
<organization>
|
||||||
<name>Inteligr8</name>
|
<name>Inteligr8</name>
|
||||||
@@ -42,145 +42,203 @@
|
|||||||
<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.majorVersion>26.1</aps.majorVersion>
|
<aps.cxf.version>3.5.0</aps.cxf.version>
|
||||||
<aps.version>${aps.majorVersion}.0</aps.version>
|
<aps.spring.version>5.3.15</aps.spring.version>
|
||||||
<!-- APS v26.1.0 uses CXF v4.2.0 -->
|
<aps.jackson.version>2.13.1</aps.jackson.version>
|
||||||
<cxf.version>4.2.0</cxf.version>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<!-- versions need to be explicit for central-publishing-maven-plugin -->
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<!-- APS provided libraries -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.activiti</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>activiti-app-root</artifactId>
|
<artifactId>spring-context</artifactId>
|
||||||
<version>${aps.version}</version>
|
<scope>provided</scope>
|
||||||
<type>pom</type>
|
</dependency>
|
||||||
<scope>import</scope>
|
<dependency>
|
||||||
|
<groupId>com.sun.xml.bind</groupId>
|
||||||
|
<artifactId>jaxb-impl</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- All APS versions v1.11.0 and later have some incarnation of the jaxws-api library; exclude all -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.xml.ws</groupId>
|
||||||
|
<artifactId>jaxws-api</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.xml.ws</groupId>
|
||||||
|
<artifactId>jakarta.xml.ws-api</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- All APS versions v1.11.0 and later have some incarnation of the activation library; exclude all -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.annotation</groupId>
|
||||||
|
<artifactId>javax.annotation-api</artifactId>
|
||||||
|
<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>
|
||||||
|
<scope>provided</scope> <!-- v1.11.4 and later; exclude in v1.11.3 and earlier for conflict with annotation-api -->
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- All APS versions v1.11.0 and later have some incarnation of the activation library; exclude all -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.activation</groupId>
|
||||||
|
<artifactId>activation</artifactId>
|
||||||
|
<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>
|
||||||
|
<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>
|
||||||
|
<scope>provided</scope> <!-- v1.11.1 and later; exclude in v1.11.2 and earlier for conflict with activation -->
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- All APS versions v1.11.0 and later have some incarnation of the jaxb-api library; exclude all -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.xml.bind</groupId>
|
||||||
|
<artifactId>jaxb-api</artifactId>
|
||||||
|
<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>
|
||||||
|
<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>
|
||||||
|
<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.dataformat</groupId>
|
||||||
|
<artifactId>jackson-dataformat-yaml</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>joda-time</groupId>
|
||||||
|
<artifactId>joda-time</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.woodstox</groupId>
|
||||||
|
<artifactId>stax2-api</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.woodstox</groupId>
|
||||||
|
<artifactId>woodstox-core-asl</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.ws.xmlschema</groupId>
|
||||||
|
<artifactId>xmlschema-core</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- ******************** -->
|
||||||
|
<!-- APS v2.x specific -->
|
||||||
|
|
||||||
|
<!-- APS provided libraries -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.cxf</groupId>
|
||||||
|
<artifactId>cxf-rt-transports-http</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.cxf</groupId>
|
<groupId>org.apache.cxf</groupId>
|
||||||
<artifactId>cxf-bom</artifactId>
|
<artifactId>cxf-core</artifactId>
|
||||||
<version>${cxf.version}</version>
|
<scope>provided</scope>
|
||||||
<type>pom</type>
|
</dependency>
|
||||||
<scope>import</scope>
|
|
||||||
|
<!-- 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>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.activiti</groupId>
|
<groupId>com.fasterxml.woodstox</groupId>
|
||||||
<artifactId>activiti-app</artifactId>
|
<artifactId>woodstox-core</artifactId>
|
||||||
<version>${aps.version}</version>
|
<scope>provided</scope>
|
||||||
<classifier>classes</classifier>
|
</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>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- Package CXF JAX-RS support -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.cxf</groupId>
|
<groupId>org.apache.cxf</groupId>
|
||||||
<artifactId>cxf-rt-rs-client</artifactId>
|
<artifactId>cxf-rt-rs-client</artifactId>
|
||||||
|
<version>${aps.cxf.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Package JackSON JAX-RS support -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
|
<groupId>com.fasterxml.jackson.jaxrs</groupId>
|
||||||
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
|
<artifactId>jackson-jaxrs-json-provider</artifactId>
|
||||||
|
<version>${aps.jackson.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Package JackSON XML support -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||||
<artifactId>jackson-dataformat-xml</artifactId>
|
<artifactId>jackson-dataformat-xml</artifactId>
|
||||||
|
<version>${aps.jackson.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Package JackSON joda-time support -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||||
<artifactId>jackson-datatype-joda</artifactId>
|
<artifactId>jackson-datatype-joda</artifactId>
|
||||||
|
<version>${aps.jackson.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Provided by APS -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.activiti</groupId>
|
<groupId>org.springframework</groupId>
|
||||||
<artifactId>activiti-app</artifactId>
|
<artifactId>spring-context</artifactId>
|
||||||
<classifier>classes</classifier>
|
<version>${aps.spring.version}</version>
|
||||||
<scope>provided</scope>
|
|
||||||
<exclusions>
|
|
||||||
<!-- not needed here and requires a separate repository in APS v24.1.0 -->
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-email2-core</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-email2-jakarta</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>versions-maven-plugin</artifactId>
|
|
||||||
<version>2.21.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
|
||||||
<version>1.7.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<version>3.11.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>3.5.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<version>3.6.2</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.inteligr8</groupId>
|
|
||||||
<artifactId>merge-maven-plugin</artifactId>
|
|
||||||
<version>1.0.1</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>truezip-maven-plugin</artifactId>
|
|
||||||
<version>1.2</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>io.repaint.maven</groupId>
|
|
||||||
<artifactId>tiles-maven-plugin</artifactId>
|
|
||||||
<version>2.44</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>versions-maven-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<property>base.version</property>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<!-- this is required because we are not creating a new POM when shading -->
|
|
||||||
<id>flatten-pom</id>
|
|
||||||
<phase>process-resources</phase>
|
|
||||||
<goals><goal>flatten</goal></goals>
|
|
||||||
<configuration>
|
|
||||||
<flattenMode>ossrh</flattenMode>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- Several CXF libraries have a bus-extensions.txt file that will overwrite each other during the packaging process -->
|
<!-- Several CXF libraries have a bus-extensions.txt file that will overwrite each other during the packaging process -->
|
||||||
<!-- Only the last one packaged will have its contents in tact -->
|
<!-- Only the last one packaged will have its contents in tact -->
|
||||||
<!-- We need the contents of all of them and that can be done by simply concatenating them -->
|
<!-- We need the contents of all of them and that can be done by simply concatenating them -->
|
||||||
@@ -189,20 +247,11 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
|
||||||
<id>copy-deps</id>
|
|
||||||
<phase>prepare-package</phase>
|
|
||||||
<goals><goal>copy-dependencies</goal></goals>
|
|
||||||
<configuration>
|
|
||||||
<includeScope>runtime</includeScope>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
<execution>
|
||||||
<id>unpack-bus-extensions</id>
|
<id>unpack-bus-extensions</id>
|
||||||
<phase>prepare-package</phase>
|
<phase>prepare-package</phase>
|
||||||
<goals><goal>unpack-dependencies</goal></goals>
|
<goals><goal>unpack-dependencies</goal></goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<includeTypes>jar</includeTypes>
|
|
||||||
<includeScope>runtime</includeScope>
|
<includeScope>runtime</includeScope>
|
||||||
<includes>META-INF/cxf/bus-extensions.txt</includes>
|
<includes>META-INF/cxf/bus-extensions.txt</includes>
|
||||||
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
|
<useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact>
|
||||||
@@ -215,6 +264,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>com.inteligr8</groupId>
|
<groupId>com.inteligr8</groupId>
|
||||||
<artifactId>merge-maven-plugin</artifactId>
|
<artifactId>merge-maven-plugin</artifactId>
|
||||||
|
<version>1.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>merge-bus-extensions</id>
|
<id>merge-bus-extensions</id>
|
||||||
@@ -238,32 +288,17 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<version>3.3.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>shade-jar</id>
|
<id>assemble-jar</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals><goal>shade</goal></goals>
|
<goals><goal>single</goal></goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- without this, the main artifact is shaded -->
|
<descriptorRefs>
|
||||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||||
<!-- this keeps the dependencies in POM, letting downstream projects know what this library provides -->
|
</descriptorRefs>
|
||||||
<!-- this is necessary as we are not renaming/relocating any packages -->
|
|
||||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
|
||||||
<transformers>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
|
|
||||||
<addHeader>false</addHeader>
|
|
||||||
</transformer>
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
|
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
|
|
||||||
<resources>
|
|
||||||
<resource>.handlers</resource>
|
|
||||||
<resource>.schemas</resource>
|
|
||||||
<resource>DEPENDENCIES</resource>
|
|
||||||
</resources>
|
|
||||||
</transformer>
|
|
||||||
</transformers>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
@@ -271,6 +306,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>truezip-maven-plugin</artifactId>
|
<artifactId>truezip-maven-plugin</artifactId>
|
||||||
|
<version>1.2</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>overwrite-bus-extensions</id>
|
<id>overwrite-bus-extensions</id>
|
||||||
@@ -282,7 +318,7 @@
|
|||||||
<includes>
|
<includes>
|
||||||
<include>META-INF/cxf/bus-extensions.txt</include>
|
<include>META-INF/cxf/bus-extensions.txt</include>
|
||||||
</includes>
|
</includes>
|
||||||
<outputDirectory>${project.build.directory}/${project.build.finalName}-shaded.jar</outputDirectory>
|
<outputDirectory>${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar</outputDirectory>
|
||||||
</fileset>
|
</fileset>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@@ -291,11 +327,12 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.repaint.maven</groupId>
|
<groupId>io.repaint.maven</groupId>
|
||||||
<artifactId>tiles-maven-plugin</artifactId>
|
<artifactId>tiles-maven-plugin</artifactId>
|
||||||
|
<version>2.21</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<tiles>
|
<tiles>
|
||||||
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-rad-tile -->
|
<!-- Documentation: https://bitbucket.org/inteligr8/ootbee-beedk/src/stable/beedk-aps-ext-rad-tile -->
|
||||||
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.1.18,2.0.0)</tile>
|
<tile>com.inteligr8.ootbee:beedk-aps-ext-rad-tile:[1.0.3,2.0.0)</tile>
|
||||||
</tiles>
|
</tiles>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@@ -315,48 +352,31 @@
|
|||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>central-publish</id>
|
<id>ossrh-release</id>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.deploy.skip>true</maven.deploy.skip>
|
<maven.deploy.skip>true</maven.deploy.skip>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>3.2.8</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.sonatype.central</groupId>
|
|
||||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
|
||||||
<version>0.10.0</version>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</pluginManagement>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<executions>
|
<executions>
|
||||||
<!-- `source` is required for deploy to maven-central -->
|
|
||||||
<execution>
|
<execution>
|
||||||
<id>sources-jar</id>
|
<id>source</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals><goal>jar-no-fork</goal></goals>
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<classifier>sources</classifier>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
</execution>
|
||||||
<!-- `javadoc` is required for deploy to maven-central -->
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>javadoc-jar</id>
|
<id>javadoc</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
<goals>
|
<goals><goal>jar</goal></goals>
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<classifier>javadoc</classifier>
|
<show>public</show>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
@@ -372,19 +392,19 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.sonatype.central</groupId>
|
<groupId>org.sonatype.plugins</groupId>
|
||||||
<artifactId>central-publishing-maven-plugin</artifactId>
|
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||||
<extensions>true</extensions>
|
<version>1.6.13</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<publishingServerId>central</publishingServerId>
|
<serverId>ossrh</serverId>
|
||||||
<autoPublish>true</autoPublish>
|
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
|
||||||
|
<autoReleaseAfterClose>true</autoReleaseAfterClose>
|
||||||
</configuration>
|
</configuration>
|
||||||
<!-- for some reason this is required... -->
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>deploy</id>
|
<id>ossrh-deploy</id>
|
||||||
<phase>deploy</phase>
|
<phase>deploy</phase>
|
||||||
<goals><goal>publish</goal></goals>
|
<goals><goal>deploy</goal></goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
@@ -392,11 +412,4 @@
|
|||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>activiti-enterprise-releases</id>
|
|
||||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -5,17 +5,17 @@ function discoverArtifactId {
|
|||||||
|
|
||||||
function rebuild {
|
function rebuild {
|
||||||
echo "Rebuilding project ..."
|
echo "Rebuilding project ..."
|
||||||
mvn process-test-classes
|
mvn process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
function start_ {
|
function start_ {
|
||||||
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
||||||
mvn -Drad process-test-classes
|
mvn -Drad process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
function start_log {
|
function start_log {
|
||||||
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
||||||
mvn -Drad "-Ddocker.showLogs" process-test-classes
|
mvn -Drad "-Ddocker.showLogs" process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
function stop_ {
|
function stop_ {
|
||||||
|
|||||||
@@ -6,17 +6,17 @@ discoverArtifactId() {
|
|||||||
|
|
||||||
rebuild() {
|
rebuild() {
|
||||||
echo "Rebuilding project ..."
|
echo "Rebuilding project ..."
|
||||||
mvn process-test-classes
|
mvn process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
||||||
mvn -Drad process-test-classes
|
mvn -Drad process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
start_log() {
|
start_log() {
|
||||||
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
echo "Rebuilding project and starting Docker containers to support rapid application development ..."
|
||||||
mvn -Drad -Ddocker.showLogs process-test-classes
|
mvn -Drad -Ddocker.showLogs process-classes
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
/*
|
||||||
|
* 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 {
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user