Merge commit '5a29b5d' into mylocalwork

Conflicts:
	.gitattributes
	examples/marc21-to-edm/edm-namespaces.properties
	examples/sort/sort-gnd.flux
	src/main/java/org/culturegraph/mf/stream/converter/ObjectTemplate.java
	src/main/java/org/culturegraph/mf/stream/pipe/OreAggregationAdder.java
	src/main/java/org/culturegraph/mf/stream/sink/SimpleXmlWriter.java
	src/main/java/org/culturegraph/mf/types/CGEntity.java
	src/test/java/org/culturegraph/mf/stream/converter/CGEntityTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextDecoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/CGTextEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/JsonEncoderTest.java
	src/test/java/org/culturegraph/mf/stream/converter/xml/GenericXMLHandlerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StreamMergerTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/StringFilterTest.java
	src/test/java/org/culturegraph/mf/stream/pipe/UniformSamplerTest.java

Author: cboehme

.travis.yml

@@ -1,3 +1,14 @@
 language: java
 jdk:
   - openjdk6
+
+env:
+  global:
+    - SONATYPE_USERNAME=culturegraph
+    - secure: "MHD7Pu9itlb4SHcf1PUkJIG3kdUEA7ZWMIFyotFNnI+FfatTsZahTN4/HBXx+99d+YLijzm9psSItLh35RPSau8GfW0fQQYSNrv9jGiDug/3boi2FB1XASNONs+wW6RGwZtv+ayvqMxXZ7y/LIXuHcPN1hcm504aAe3MwSmMUV8="
+
+
+
+after_success:
+  - python travis-ci/configure-mvn.py
+  - mvn clean deploy --settings ~/.m2/mySettings.xml -Dgpg.skip=true -Psonatype-oss-release