svn commit: r1372163 [4/4] - in /abdera/java/branches/axiom-upgrade: ./ dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/ parser/ parser/src/main/java/org/apache/abdera/parser/stax/ parser/src/test/java/org/apache/abdera/test/parser/stax/...

[veithen]

Propchange: abdera/java/branches/axiom-upgrade/parser/src/test/resources/
            ('svn:ignore' removed)

Modified: abdera/java/branches/axiom-upgrade/pom.xml
URL: 
http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/pom.xml?rev=1372163&r1=1372162&r2=1372163&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/pom.xml (original)
+++ abdera/java/branches/axiom-upgrade/pom.xml Sun Aug 12 18:07:30 2012
@@ -340,9 +340,7 @@
                                                        
<exclude>**/*TestSuite*</exclude>
                                                        
<exclude>**/*$*</exclude>
                                                        
<exclude>**/*TestAdapter*</exclude>
-                                                       
<exclude>**/FeedValidatorTest.java</exclude>
                                                        
<exclude>**/DSigThirdPartyVerifyTest.java</exclude>
-                                                       
<exclude>**/AtomConformanceTest.java</exclude>
                                                </excludes>
                                        </configuration>
                                </plugin>

Propchange: 
abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
------------------------------------------------------------------------------
  Merged 
/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java:r1371963-1372162