This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-3991 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit f86ea3049df51974c26406038ab5a1d6e3947169 Author: Elek Márton <e...@apache.org> AuthorDate: Tue Jul 21 10:43:04 2020 +0200 switch to use maven based ignore model --- .gitignore | 4 ---- hadoop-hdds/interface-admin/src/main/{proto => resources}/proto.lock | 0 hadoop-hdds/interface-client/src/main/{proto => resources}/proto.lock | 0 hadoop-hdds/interface-server/src/main/{proto => resources}/proto.lock | 0 .../interface-client/src/main/{proto => resources}/proto.lock | 0 pom.xml | 2 +- proto.lock | 0 7 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a3dbad1..e09c2eb 100644 --- a/.gitignore +++ b/.gitignore @@ -65,7 +65,3 @@ hadoop-hdds/docs/public hadoop-ozone/recon/node_modules .mvn - -# Protolock files should be updated manually after every release -# See: https://github.com/nilslice/protolock -*/proto/*.lock diff --git a/hadoop-hdds/interface-admin/src/main/proto/proto.lock b/hadoop-hdds/interface-admin/src/main/resources/proto.lock similarity index 100% rename from hadoop-hdds/interface-admin/src/main/proto/proto.lock rename to hadoop-hdds/interface-admin/src/main/resources/proto.lock diff --git a/hadoop-hdds/interface-client/src/main/proto/proto.lock b/hadoop-hdds/interface-client/src/main/resources/proto.lock similarity index 100% rename from hadoop-hdds/interface-client/src/main/proto/proto.lock rename to hadoop-hdds/interface-client/src/main/resources/proto.lock diff --git a/hadoop-hdds/interface-server/src/main/proto/proto.lock b/hadoop-hdds/interface-server/src/main/resources/proto.lock similarity index 100% rename from hadoop-hdds/interface-server/src/main/proto/proto.lock rename to hadoop-hdds/interface-server/src/main/resources/proto.lock diff --git a/hadoop-ozone/interface-client/src/main/proto/proto.lock b/hadoop-ozone/interface-client/src/main/resources/proto.lock similarity index 100% rename from hadoop-ozone/interface-client/src/main/proto/proto.lock rename to hadoop-ozone/interface-client/src/main/resources/proto.lock diff --git a/pom.xml b/pom.xml index 40f2f58..e803ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -1615,7 +1615,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <artifactId>proto-backwards-compatibility</artifactId> <version>${proto-backwards-compatibility.version}</version> <configuration> - <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot> + <protoSourceRoot>${basedir}/target/classes</protoSourceRoot> </configuration> <executions> <execution> diff --git a/proto.lock b/proto.lock deleted file mode 100644 index e69de29..0000000 --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org