Author: veithen
Date: Sat Oct 8 17:01:53 2011
New Revision: 1180412
URL: http://svn.apache.org/viewvc?rev=1180412&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/ (props
changed)
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/etc/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/etc/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/etc/logging.properties
- copied unchanged from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/etc/logging.properties
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/pom.xml
- copied unchanged from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/pom.xml
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/
- copied from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/OMAbstractFactoryTest.java
- copied unchanged from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/OMAbstractFactoryTest.java
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/ServiceTest.java
- copied unchanged from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/ServiceTest.java
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/StAXOMBuilderTest.java
- copied unchanged from r1180410,
webservices/commons/trunk/modules/axiom/modules/axiom-osgi-tests/src/test/java/org/apache/axiom/test/StAXOMBuilderTest.java
Removed:
webservices/axiom/branches/osgi-redesign/modules/axiom-osgi/
Modified:
webservices/axiom/branches/osgi-redesign/ (props changed)
webservices/axiom/branches/osgi-redesign/modules/axiom-integration/pom.xml
webservices/axiom/branches/osgi-redesign/modules/axiom-parent/pom.xml
webservices/axiom/branches/osgi-redesign/modules/shade-plugin-patched/
(props changed)
webservices/axiom/branches/osgi-redesign/pom.xml
Propchange: webservices/axiom/branches/osgi-redesign/
------------------------------------------------------------------------------
svn:mergeinfo = /webservices/commons/trunk/modules/axiom:1180368-1180410
Modified:
webservices/axiom/branches/osgi-redesign/modules/axiom-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/osgi-redesign/modules/axiom-integration/pom.xml?rev=1180412&r1=1180411&r2=1180412&view=diff
==============================================================================
--- webservices/axiom/branches/osgi-redesign/modules/axiom-integration/pom.xml
(original)
+++ webservices/axiom/branches/osgi-redesign/modules/axiom-integration/pom.xml
Sat Oct 8 17:01:53 2011
@@ -53,7 +53,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -113,7 +112,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Propchange: webservices/axiom/branches/osgi-redesign/modules/axiom-osgi-tests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Oct 8 17:01:53 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: webservices/axiom/branches/osgi-redesign/modules/axiom-parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/osgi-redesign/modules/axiom-parent/pom.xml?rev=1180412&r1=1180411&r2=1180412&view=diff
==============================================================================
--- webservices/axiom/branches/osgi-redesign/modules/axiom-parent/pom.xml
(original)
+++ webservices/axiom/branches/osgi-redesign/modules/axiom-parent/pom.xml Sat
Oct 8 17:01:53 2011
@@ -239,7 +239,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.10</version>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -273,6 +273,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<inherited>true</inherited>
<configuration>
<source>1.3</source>
@@ -414,7 +415,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.9</version>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
Propchange:
webservices/axiom/branches/osgi-redesign/modules/shade-plugin-patched/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Oct 8 17:01:53 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: webservices/axiom/branches/osgi-redesign/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/osgi-redesign/pom.xml?rev=1180412&r1=1180411&r2=1180412&view=diff
==============================================================================
--- webservices/axiom/branches/osgi-redesign/pom.xml (original)
+++ webservices/axiom/branches/osgi-redesign/pom.xml Sat Oct 8 17:01:53 2011
@@ -540,7 +540,7 @@
<module>modules/axiom-dom</module>
<module>modules/axiom-c14n</module>
<module>modules/axiom-tests</module>
- <module>modules/axiom-osgi</module>
+ <module>modules/axiom-osgi-tests</module>
<module>modules/axiom-integration</module>
</modules>
</project>
