You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2011/12/26 09:51:30 UTC
svn commit: r1224697 [1/2] - in /synapse/trunk/java: ./ modules/commons/
modules/core/ modules/core/src/test/java/org/apache/synapse/mediators/
modules/core/src/test/java/org/apache/synapse/mediators/eip/
modules/distribution/ modules/distribution/src/...
Author: hiranya
Date: Mon Dec 26 08:51:29 2011
New Revision: 1224697
URL: http://svn.apache.org/viewvc?rev=1224697&view=rev
Log:
POM cleanup
1. Removed unneccessary dependencies (bcel, groovy, jlex etc)
2. All dependency versions defined properly in the root POM's dependency mgt section
3. All plugin versions defined properly in the root POM's plugin mgt section
4. Plugins upgraded to latest compatible versions (except for maven-assembly-plugin whose latest version messes up the file permissions of the created artifacts)
5. Integration module added to the build
6. Securevault and xar-plugin modules added as children of the root POM
7. 3rd party dependencies upgraded to latest compatible versions (almost all Apache commons libs, throttling etc)
8. Fixed throttling issues in the trunk and re-enabled the ThrottleMediatorTest
Modified:
synapse/trunk/java/modules/commons/pom.xml
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/AbstractSplitMediatorTestCase.java
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/experimental/pom.xml
synapse/trunk/java/modules/extensions/pom.xml
synapse/trunk/java/modules/handler/pom.xml
synapse/trunk/java/modules/integration/pom.xml
synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
synapse/trunk/java/modules/integration/src/test/resources/test-log4j.properties
synapse/trunk/java/modules/migrator/pom.xml
synapse/trunk/java/modules/packaging/package-archetype/pom.xml
synapse/trunk/java/modules/packaging/package-skeleton/pom.xml
synapse/trunk/java/modules/packaging/package-skeleton/src/main/assembly/skeleton.xml
synapse/trunk/java/modules/patches/pom.xml
synapse/trunk/java/modules/samples/pom.xml
synapse/trunk/java/modules/securevault/pom.xml
synapse/trunk/java/modules/tasks/pom.xml
synapse/trunk/java/modules/transports/core/nhttp/pom.xml
synapse/trunk/java/modules/transports/core/pipe/pom.xml
synapse/trunk/java/modules/transports/core/vfs/pom.xml
synapse/trunk/java/modules/transports/optional/fix/pom.xml
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/modules/war/pom.xml
synapse/trunk/java/modules/xar-maven-plugin/pom.xml
synapse/trunk/java/pom.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_371.xml
Modified: synapse/trunk/java/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/pom.xml (original)
+++ synapse/trunk/java/modules/commons/pom.xml Mon Dec 26 08:51:29 2011
@@ -33,23 +33,18 @@
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-commons</artifactId>
- <name>Apache Synapse - Commons classes</name>
- <description>Apache Synapse - Commons classes</description>
+ <name>Apache Synapse - Commons</name>
+ <description>Apache Synapse - Common Utilities</description>
<packaging>bundle</packaging>
<build>
<plugins>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
</plugin>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -66,7 +61,6 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
@@ -74,17 +68,26 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
- <version>${axis2.transport.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-securevault</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
</project>
Modified: synapse/trunk/java/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Mon Dec 26 08:51:29 2011
@@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy</id>
@@ -71,7 +70,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>create_repo</id>
@@ -91,11 +89,9 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -131,7 +127,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -187,32 +182,54 @@
<artifactId>synapse-nhttp-transport</artifactId>
</dependency>
<dependency>
+ <groupId>org.wso2.eventing</groupId>
+ <artifactId>wso2eventing-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.caching</groupId>
+ <artifactId>wso2caching-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.uri.template</groupId>
+ <artifactId>wso2-uri-templates</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-jms</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- <version>${commons.vfs.version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-vfs-transport</artifactId>
<scope>test</scope>
- </dependency>
- <!-- This is used by the CacheMediator. TODO: since axis2-saaj is based on
- Axiom, it should not be necessary to rely on SAAJ and we should try
- to eliminate this dependency. -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
</dependency>
</dependencies>
</project>
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/AbstractMediatorTestCase.java Mon Dec 26 08:51:29 2011
@@ -29,7 +29,7 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import java.io.StringReader;
-public class AbstractMediatorTestCase extends TestCase {
+public abstract class AbstractMediatorTestCase extends TestCase {
protected static OMElement createOMElement(String xml) {
return SynapseConfigUtils.stringToOM(xml);
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/AbstractSplitMediatorTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/AbstractSplitMediatorTestCase.java?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/AbstractSplitMediatorTestCase.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/eip/AbstractSplitMediatorTestCase.java Mon Dec 26 08:51:29 2011
@@ -15,7 +15,7 @@ import org.apache.synapse.mediators.base
/**
* Preperation of the split mediator test cases
*/
-public class AbstractSplitMediatorTestCase extends AbstractMediatorTestCase {
+public abstract class AbstractSplitMediatorTestCase extends AbstractMediatorTestCase {
SplitTestHelperMediator helperMediator;
MessageContext testCtx;
Modified: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Mon Dec 26 08:51:29 2011
@@ -38,30 +38,37 @@
<dependencies>
<dependency>
<groupId>org.apache.synapse</groupId>
+ <artifactId>synapse-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>synapse-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.synapse</groupId>
<artifactId>synapse-extensions</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-samples</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-experimental</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-config-migrator</artifactId>
- <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>synapse-fix-transport</artifactId>
</dependency>
<!-- Wrapper jars -->
<dependency>
<groupId>wrapper</groupId>
<artifactId>wrapper</artifactId>
- <version>${wrapper.version}</version>
</dependency>
<!-- The distribution is configured for log4j. Normally, log4j should not
@@ -75,57 +82,21 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.woden</groupId>
- <artifactId>woden-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- </exclusions>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2</artifactId>
- <version>${sandesha2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </exclusion>
- </exclusions>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-policy</artifactId>
- <version>${sandesha2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>${addressing.version}</version>
<type>mar</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Because of a design flaw in Axis2 (see AXIS2-4265), axis2-codegen is required
@@ -159,10 +130,17 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-patches</artifactId>
- <version>${pom.version}</version>
<classifier>jars</classifier>
<type>zip</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ </dependency>
+ <!--dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency-->
</dependencies>
<repositories>
@@ -183,9 +161,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<id>distribution-package</id>
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Mon Dec 26 08:51:29 2011
@@ -237,21 +237,13 @@
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.rampart:rampart:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
- <exclude>org.apache.ant:ant:jar</exclude>
- <exclude>org.apache.ant:ant-launcher:jar</exclude>
<exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>xml-apis:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
- <exclude>org.apache.xerces:xercesImpl</exclude>
- <exclude>org.apache.xerces:xml-apis</exclude>
- <exclude>junit:junit:jar</exclude>
- <exclude>org.apache.mina:mina-core:jar</exclude>
- <exclude>org.slf4j:slf4j-api:jar</exclude>
- <exclude>org.slf4j:slf4j-jdk14:jar</exclude>
- <exclude>org.slf4j:jcl-over-slf4j:jar</exclude>
- <exclude>org.slf4j:log4j-over-slf4j:jar</exclude>
- <exclude>com.oopsconsultancy:xmltask:jar</exclude>
- <exclude>xalan:xalan:jar</exclude>
+ <exclude>org.apache.xerces:xercesImpl</exclude> <!-- Find the source of this -->
+ <exclude>org.apache.xerces:xml-apis</exclude>
+ <exclude>xalan:xalan:jar</exclude>
+ <exclude>quickfixj:quickfixj-all:jar</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -266,7 +258,6 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>synapse-${synapse.version}/lib/endorsed</outputDirectory>
<includes>
- <include>xml-apis:xml-apis:jar</include>
<include>xerces:xercesImpl:jar</include>
</includes>
</dependencySet>
Modified: synapse/trunk/java/modules/experimental/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/experimental/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/experimental/pom.xml (original)
+++ synapse/trunk/java/modules/experimental/pom.xml Mon Dec 26 08:51:29 2011
@@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: synapse/trunk/java/modules/extensions/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/pom.xml (original)
+++ synapse/trunk/java/modules/extensions/pom.xml Mon Dec 26 08:51:29 2011
@@ -43,18 +43,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
- <!--configuration>
- <excludes>
- <exclude>org/apache/synapse/mediators/throttle/ThrottleMediatorTest.java</exclude>
- </excludes>
- </configuration-->
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -93,221 +86,60 @@
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
- <scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>${xbean.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xqj</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bsf</groupId>
<artifactId>bsf-all</artifactId>
- <version>${bsf.version}</version>
</dependency>
- <dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>${jruby.version}</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ </dependency>
<dependency>
<groupId>groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mockobjects</groupId>
- <artifactId>mockobjects-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jmock</groupId>
- <artifactId>jmock-cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- </exclusion>
- <exclusion>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- </exclusion>
- <exclusion>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>radeox</groupId>
- <artifactId>radeox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>radeox</groupId>
- <artifactId>radeox-oro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.tonicsystems</groupId>
- <artifactId>jarjar</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.wso2.throttle</groupId>
<artifactId>wso2throttle-core</artifactId>
- <version>${wso2throttle.version}</version>
- <type>jar</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-clustering</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
- <!--For Axiom/E4X -->
- <!--<dependency>
- <groupId>org.wso2.javascript.rhino</groupId>
- <artifactId>js-axiom</artifactId>
- <version>SNAPSHOT</version>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
</dependency>
-
<dependency>
- <groupId>org.mozilla.javascript</groupId>
- <artifactId>js-core</artifactId>
- <version>SNAPSHOT</version>
- </dependency>-->
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
</dependencies>
-
- <properties>
- <spring.version>1.2.8</spring.version>
- </properties>
+
</project>
Modified: synapse/trunk/java/modules/handler/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/handler/pom.xml (original)
+++ synapse/trunk/java/modules/handler/pom.xml Mon Dec 26 08:51:29 2011
@@ -38,13 +38,10 @@
<packaging>bundle</packaging>
<build>
-
<plugins>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -62,11 +59,9 @@
</instructions>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>mar</id>
@@ -83,11 +78,9 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<id>mar</id>
Modified: synapse/trunk/java/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/pom.xml (original)
+++ synapse/trunk/java/modules/integration/pom.xml Mon Dec 26 08:51:29 2011
@@ -39,11 +39,9 @@
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
<executions>
<execution>
<id>create_repo</id>
@@ -241,7 +239,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.3</version>
<executions>
<execution>
<id>copy</id>
@@ -259,7 +256,6 @@
<outputDirectory>target/test_repos/axis2Server/modules
</outputDirectory>
</artifactItem>
-
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
@@ -292,7 +288,6 @@
<outputDirectory>target/test_repos/axis2Client/modules
</outputDirectory>
</artifactItem>
-
<artifactItem>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
@@ -323,11 +318,9 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
<configuration>
<systemPropertyVariables>
<property>
@@ -354,7 +347,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.7.2</version>
<configuration>
<outputName>sample_automation</outputName>
</configuration>
@@ -380,14 +372,12 @@
<artifactId>synapse-samples</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.synapse</groupId>
- <artifactId>synapse-fix-transport</artifactId>
- <version>${synapse.version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${rampart.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -397,83 +387,75 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-base</artifactId>
- <version>${axis2.transport.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-jms</artifactId>
- <version>${axis2.transport.version}</version>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-udp</artifactId>
- <version>${axis2.transport.version}</version>
+ <artifactId>axis2-transport-base</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-tcp</artifactId>
- <version>1.0.0</version>
+ <artifactId>axis2-transport-jms</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>${jruby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
- <version>10.8.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <version>10.8.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.8.1.2</version>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>3.0.1</version>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xqj</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.caching</groupId>
+ <artifactId>wso2caching-core</artifactId>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
Modified: synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java (original)
+++ synapse/trunk/java/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java Mon Dec 26 08:51:29 2011
@@ -210,9 +210,9 @@ public class TestSamplesHandlerSuite ext
sampleClassRepo.put("360", Sample360.class);
sampleClassRepo.put("361", Sample361.class);
sampleClassRepo.put("362", Sample362.class);
- //sampleClassRepo.put("370", Sample370.class); // neethi 3.0.x and wso2throttle incompatibility
- //sampleClassRepo.put("371", Sample371.class);
- //sampleClassRepo.put("372", Sample372.class);
+ sampleClassRepo.put("370", Sample370.class); // neethi 3.0.x and wso2throttle incompatibility
+ sampleClassRepo.put("371", Sample371.class);
+ sampleClassRepo.put("372", Sample372.class);
sampleClassRepo.put("380", Sample380.class);
sampleClassRepo.put("390", Sample390.class);
sampleClassRepo.put("391", Sample391.class);
Modified: synapse/trunk/java/modules/integration/src/test/resources/test-log4j.properties
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration/src/test/resources/test-log4j.properties?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/integration/src/test/resources/test-log4j.properties (original)
+++ synapse/trunk/java/modules/integration/src/test/resources/test-log4j.properties Mon Dec 26 08:51:29 2011
@@ -42,7 +42,7 @@ log4j.appender.CONSOLE_APPENDER.layout.C
# The standard log file that may be set upto DEBUG/TRACE for general purpose logging
# Logs information at startup/initialization etc. and also could be used as the developer log
log4j.appender.LOG_APPENDER=org.apache.log4j.RollingFileAppender
-log4j.appender.LOG_APPENDER.File=sampleAutomationLogs/synapse-${timeStamp}.log
+log4j.appender.LOG_APPENDER.File=modules/integration/target/sampleAutomationLogs/synapse-${timeStamp}.log
log4j.appender.LOG_APPENDER.MaxFileSize=1000KB
log4j.appender.LOG_APPENDER.MaxBackupIndex=10
log4j.appender.LOG_APPENDER.layout=org.apache.log4j.PatternLayout
Modified: synapse/trunk/java/modules/migrator/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/migrator/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/migrator/pom.xml (original)
+++ synapse/trunk/java/modules/migrator/pom.xml Mon Dec 26 08:51:29 2011
@@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Modified: synapse/trunk/java/modules/packaging/package-archetype/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/packaging/package-archetype/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/packaging/package-archetype/pom.xml (original)
+++ synapse/trunk/java/modules/packaging/package-archetype/pom.xml Mon Dec 26 08:51:29 2011
@@ -46,13 +46,12 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-4</version>
+ <version>2.2</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
<configuration>
<escapeString>\</escapeString>
<encoding>UTF-8</encoding>
@@ -60,7 +59,6 @@
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: synapse/trunk/java/modules/packaging/package-skeleton/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/packaging/package-skeleton/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/packaging/package-skeleton/pom.xml (original)
+++ synapse/trunk/java/modules/packaging/package-skeleton/pom.xml Mon Dec 26 08:51:29 2011
@@ -40,19 +40,16 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>wrapper</groupId>
<artifactId>wrapper</artifactId>
- <version>${wrapper.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<id>skeleton-package</id>
Modified: synapse/trunk/java/modules/packaging/package-skeleton/src/main/assembly/skeleton.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/packaging/package-skeleton/src/main/assembly/skeleton.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/packaging/package-skeleton/src/main/assembly/skeleton.xml (original)
+++ synapse/trunk/java/modules/packaging/package-skeleton/src/main/assembly/skeleton.xml Mon Dec 26 08:51:29 2011
@@ -18,6 +18,7 @@
~ under the License.
-->
<assembly>
+ <id>skeleton</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
Modified: synapse/trunk/java/modules/patches/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/patches/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/patches/pom.xml (original)
+++ synapse/trunk/java/modules/patches/pom.xml Mon Dec 26 08:51:29 2011
@@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
<executions>
<execution>
<phase>process-classes</phase>
@@ -64,20 +63,19 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<unjar dest="${project.build.outputDirectory}">
<fileset dir="${basedir}/jars">
<include name="**/*.jar"/>
</fileset>
</unjar>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<executions>
<execution>
<phase>package</phase>
@@ -99,7 +97,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
- <version>${commons.vfs.version}</version>
</dependency>
</dependencies>
</project>
Modified: synapse/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/pom.xml (original)
+++ synapse/trunk/java/modules/samples/pom.xml Mon Dec 26 08:51:29 2011
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<id>create_repo</id>
@@ -249,7 +248,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-1</version>
<executions>
<execution>
<id>copy</id>
@@ -351,7 +349,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<forkMode>pertest</forkMode>
<includes>
@@ -392,7 +389,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -419,20 +415,13 @@
<artifactId>synapse-extensions</artifactId>
</dependency>
<dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>${jruby.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${jms-1.1-spec.version}</version>
</dependency>
<!-- Rampart -->
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${rampart.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.woden</groupId>
Modified: synapse/trunk/java/modules/securevault/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/securevault/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/securevault/pom.xml (original)
+++ synapse/trunk/java/modules/securevault/pom.xml Mon Dec 26 08:51:29 2011
@@ -23,38 +23,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- TODO: shouldn't this be a Synapse specific parent-POM??? -->
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>7</version>
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>Apache-Synapse</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.synapse</groupId>
<artifactId>synapse-securevault</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<name>Apache Synapse - Secure vault</name>
<description>Apache Synapse - Secure vault</description>
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,80 +66,35 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>${jline.version}</version>
- </dependency>
- <!-- direct dependencies for 3rd party JARs / Util JARs -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons_io.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
</dependency>
-
</dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <axiom.version>1.2.9</axiom.version>
- <commons.logging.version>1.1.1</commons.logging.version>
- <junit.version>3.8.2</junit.version>
- <log4j.version>1.2.14</log4j.version>
- <commons-cli.version>1.0</commons-cli.version>
- <jline.version>0.9.94</jline.version>
- <commons_io.version>2.0</commons_io.version>
- <commons-codec.version>1.2</commons-codec.version>
- </properties>
</project>
Modified: synapse/trunk/java/modules/tasks/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/tasks/pom.xml (original)
+++ synapse/trunk/java/modules/tasks/pom.xml Mon Dec 26 08:51:29 2011
@@ -33,8 +33,8 @@
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-tasks</artifactId>
- <name>Apache Synapse - Tasks classes</name>
- <description>Apache Synapse - Tasks classes</description>
+ <name>Apache Synapse - Tasks</name>
+ <description>Apache Synapse - Scheduled Tasks Core</description>
<packaging>bundle</packaging>
<build>
@@ -43,13 +43,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.2</version>
</plugin>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -66,7 +63,6 @@
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
@@ -74,28 +70,14 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-commons</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.opensymphony</groupId>
<artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo-spec.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
</dependency>
</dependencies>
- <properties>
- <!-- startup, quartz -->
- <commons-collections.version>3.1</commons-collections.version>
- <quartz.version>1.6.0</quartz.version>
- <geronimo-spec.version>1.1</geronimo-spec.version>
- </properties>
</project>
Modified: synapse/trunk/java/modules/transports/core/nhttp/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/pom.xml Mon Dec 26 08:51:29 2011
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -60,7 +59,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy</id>
@@ -84,7 +82,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -134,12 +131,10 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${httpcore.nio.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
- <version>${httpcore.nio.version}</version>
</dependency>
<!-- The HTTP NIO transport depends on a few methods from the blocking HTTP transport,
so we need to add this as an explicit dependency. -->
@@ -153,8 +148,4 @@
</dependency>
</dependencies>
- <properties>
- <httpcore.nio.version>4.1</httpcore.nio.version>
- </properties>
-
</project>
Modified: synapse/trunk/java/modules/transports/core/pipe/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/pipe/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/pipe/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/pipe/pom.xml Mon Dec 26 08:51:29 2011
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -58,6 +57,4 @@
</plugins>
</build>
- <dependencies>
- </dependencies>
</project>
\ No newline at end of file
Modified: synapse/trunk/java/modules/transports/core/vfs/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/vfs/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/vfs/pom.xml Mon Dec 26 08:51:29 2011
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -62,7 +61,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy</id>
@@ -86,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
<configuration>
<systemProperties>
<property>
@@ -111,7 +108,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/testkit-logs.xml</descriptor>
@@ -136,44 +132,18 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
- <version>${commons.vfs.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
<groupId>de.schlichtherle.io</groupId>
<artifactId>truezip</artifactId>
- <version>${truezip.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>${commons.net.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>${jsch.version}</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>${oro.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons_io.version}</version>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
</dependency>
</dependencies>
</project>
Modified: synapse/trunk/java/modules/transports/optional/fix/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/fix/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/optional/fix/pom.xml (original)
+++ synapse/trunk/java/modules/transports/optional/fix/pom.xml Mon Dec 26 08:51:29 2011
@@ -41,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -107,17 +106,11 @@
<dependency>
<groupId>quickfixj</groupId>
<artifactId>quickfixj-all</artifactId>
- <version>${qfj.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.synapse</groupId>
- <artifactId>synapse-core</artifactId>
- <scope>test</scope>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
- <properties>
- <qfj.version>1.4.0</qfj.version>
- </properties>
-
</project>
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Mon Dec 26 08:51:29 2011
@@ -43,16 +43,6 @@
<module>optional/fix</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.synapse</groupId>
@@ -68,17 +58,10 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-base</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-testkit</artifactId>
- <version>${axis2.transport.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <aspectj.version>1.6.1</aspectj.version>
- </properties>
-
</project>
Modified: synapse/trunk/java/modules/war/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/war/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/war/pom.xml (original)
+++ synapse/trunk/java/modules/war/pom.xml Mon Dec 26 08:51:29 2011
@@ -41,17 +41,14 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-extensions</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-samples</artifactId>
- <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-experimental</artifactId>
- <version>${pom.version}</version>
</dependency>
<!-- Because of a design flaw in Axis2 (see AXIS2-4265), axis2-codegen is required
@@ -79,7 +76,6 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-patches</artifactId>
- <version>${pom.version}</version>
</dependency>
</dependencies>
@@ -89,7 +85,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<id>copy</id>
@@ -139,11 +134,9 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
<configuration>
<warName>synapse</warName>
<archive>
Modified: synapse/trunk/java/modules/xar-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/xar-maven-plugin/pom.xml?rev=1224697&r1=1224696&r2=1224697&view=diff
==============================================================================
--- synapse/trunk/java/modules/xar-maven-plugin/pom.xml (original)
+++ synapse/trunk/java/modules/xar-maven-plugin/pom.xml Mon Dec 26 08:51:29 2011
@@ -21,46 +21,38 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.synapse</groupId>
+ <parent>
+ <groupId>org.apache.synapse</groupId>
+ <artifactId>Apache-Synapse</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
<artifactId>synapse-xar-maven-plugin</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Synapse - XAR Maven Plugin</name>
<description>Maven 2 plugin to create Synapse extension archives</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.version>2.0.7</maven.version>
- <maven.artifact.version>2.0.8</maven.artifact.version>
- <maven.archiver.version>2.2</maven.archiver.version>
- <plexus.utils.version>1.5.4</plexus.utils.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven.artifact.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>${maven.archiver.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexus.utils.version}</version>
</dependency>
</dependencies>
@@ -68,10 +60,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
</plugin>
</plugins>
</build>