Commit 66483da5 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 97524b66 47def7f9

pom.xml

+5 −16
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 
	<parent>

		<groupId>com.activiti</groupId>

		<artifactId>activiti-app-root</artifactId>

		<version>2.4.5</version>

		<version>24.1.0</version>

	</parent>

	

	<groupId>com.inteligr8.activiti</groupId>

	<artifactId>cxf-activiti-ext</artifactId>

	<version>1.2.0-aps-v2.4.5</version>

	<artifactId>cxf-activiti-app-ext</artifactId>

	<version>1.3.0-aps-v24.1</version>

	<packaging>jar</packaging>

	

	<name>CXF-based JAX-RS &amp; JAX-WS enablement for APS App</name>
@@ -54,11 +54,6 @@ 
	<dependencyManagement>

		<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>
@@ -215,12 +210,6 @@ 
	</dependencyManagement>



	<dependencies>

		<dependency>

			<groupId>org.springframework</groupId>

			<artifactId>spring-context</artifactId>

			<version>${spring.version}</version>

		</dependency>

		

		<!-- Package CXF JAX-RS support -->

		<dependency>

			<groupId>org.apache.cxf</groupId>
@@ -230,8 +219,8 @@ 
		</dependency>

		<!-- Package JackSON JAX-RS support -->

		<dependency>

			<groupId>com.fasterxml.jackson.jaxrs</groupId>

			<artifactId>jackson-jaxrs-json-provider</artifactId>

			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>

			<artifactId>jackson-jakarta-rs-json-provider</artifactId>

			<scope>runtime</scope>

		</dependency>

		<!-- Package JackSON XML support -->

src/main/java/com/activiti/extension/conf/CxfActivitiExtSpringComponentScanner.java

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * 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 {



}