From 91b2f42940e733beb1579e8d3cc1f16321f96989 Mon Sep 17 00:00:00 2001
From: Gilles <erans@apache.org>
Date: Tue, 19 Apr 2016 12:48:47 +0200
Subject: [PATCH] Revert "Standard Maven directory layout"

This reverts commit 5bbd826e2f4332b0de439d2b4693347f4f2f8f9c.
The corresponding changes have been ported into branch "develop".
---
 pom.xml                         | 4 ++--
 src/{ => main}/assembly/bin.xml | 0
 src/{ => main}/assembly/src.xml | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{ => main}/assembly/bin.xml (100%)
 rename src/{ => main}/assembly/src.xml (100%)

diff --git a/pom.xml b/pom.xml
index 8f633af34..145c0d6dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,8 +439,8 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
             <descriptors>
-              <descriptor>src/assembly/src.xml</descriptor>
-              <descriptor>src/assembly/bin.xml</descriptor>
+              <descriptor>src/main/assembly/src.xml</descriptor>
+              <descriptor>src/main/assembly/bin.xml</descriptor>
             </descriptors>
             <!-- There are a lot of long file names. Suppress the warnings. -->
             <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/src/assembly/bin.xml b/src/main/assembly/bin.xml
similarity index 100%
rename from src/assembly/bin.xml
rename to src/main/assembly/bin.xml
diff --git a/src/assembly/src.xml b/src/main/assembly/src.xml
similarity index 100%
rename from src/assembly/src.xml
rename to src/main/assembly/src.xml