Propchange: axis/axis2/java/core/branches/1_6/ ------------------------------------------------------------------------------ Merged /axis/axis2/java/core/trunk:r1410499
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1445364&r1=1445363&r2=1445364&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Tue Feb 12 21:09:58 2013 @@ -76,7 +76,7 @@ <commons.codec.version>1.3</commons.codec.version> <commons.fileupload.version>1.2</commons.fileupload.version> <commons.httpclient.version>3.1</commons.httpclient.version> - <commons.io.version>1.4</commons.io.version> + <commons.io.version>2.1</commons.io.version> <commons.logging.version>1.1.1</commons.logging.version> <fi.version>1.2.7</fi.version> <geronimo.spec.activation.version>1.0.2</geronimo.spec.activation.version> @@ -926,6 +926,18 @@ <artifactId>jetty</artifactId> <version>5.1.10</version> </dependency> + + <!-- AspectJ is used in the unit tests of several transports --> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>1.6.1</version> + </dependency> </dependencies> </dependencyManagement> Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ ------------------------------------------------------------------------------ Merged /axis/axis2/java/core/trunk/modules/saaj:r1410499 Propchange: axis/axis2/java/core/branches/1_6/modules/transport/base/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/base/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/base/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/base/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/base/pom.xml Tue Feb 12 21:09:58 2013 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/jms/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/jms/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/jms/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/jms/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/jms/pom.xml Tue Feb 12 21:09:58 2013 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/mail/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/mail/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/mail/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/mail/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/mail/pom.xml Tue Feb 12 21:09:58 2013 @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/tcp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/tcp/pom.xml Tue Feb 12 21:09:58 2013 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <artifactId>axis2-transport-tcp</artifactId> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/testkit/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/testkit/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/testkit/pom.xml Tue Feb 12 21:09:58 2013 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <artifactId>axis2-transport-testkit</artifactId> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/udp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/udp/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/udp/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/udp/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/udp/pom.xml Tue Feb 12 21:09:58 2013 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <artifactId>axis2-transport-udp</artifactId> Propchange: axis/axis2/java/core/branches/1_6/modules/transport/xmpp/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Feb 12 21:09:58 2013 @@ -0,0 +1,5 @@ +target +.classpath +.project +.settings +*.iml Copied: axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml (from r1410499, axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml) URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml?p2=axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml&p1=axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml&r1=1410499&r2=1445364&rev=1445364&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/xmpp/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/transport/xmpp/pom.xml Tue Feb 12 21:09:58 2013 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.axis2</groupId> <artifactId>axis2-parent</artifactId> - <version>1.7.0-SNAPSHOT</version> + <version>1.6.3-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <artifactId>axis2-transport-xmpp</artifactId> Modified: axis/axis2/java/core/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1445364&r1=1445363&r2=1445364&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/pom.xml Tue Feb 12 21:09:58 2013 @@ -82,6 +82,13 @@ <module>modules/osgi</module> <module>modules/transport/local</module> <module>modules/transport/http</module> + <module>modules/transport/base</module> + <module>modules/transport/jms</module> + <module>modules/transport/mail</module> + <module>modules/transport/tcp</module> + <module>modules/transport/testkit</module> + <module>modules/transport/udp</module> + <module>modules/transport/xmpp</module> </modules> <profiles> <profile>
