Merging publish changes from 'feature/site-git-migration'

author Martin Stockhammer <martin_s@apache.org>

Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)

committer Martin Stockhammer <martin_s@apache.org>

Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)
author Martin Stockhammer <martin_s@apache.org>
Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)
committer Martin Stockhammer <martin_s@apache.org>
Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)
diff --cc archiva-modules/plugins/maven2-repository/pom.xml
Simple merge
diff --cc pom.xml
Simple merge
author	Martin Stockhammer <martin_s@apache.org>
	Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)
committer	Martin Stockhammer <martin_s@apache.org>
	Tue, 11 Dec 2018 20:03:24 +0000 (21:03 +0100)
		1	2
archiva-modules/plugins/maven2-repository/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history