You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2020/07/21 08:46:20 UTC
[hadoop-ozone] branch HDDS-3991 created (now f86ea30)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a change to branch HDDS-3991
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git.
at f86ea30 switch to use maven based ignore model
This branch includes the following new commits:
new 5b9e7e8 asd
new f86ea30 switch to use maven based ignore model
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 01/02: asd
Posted by el...@apache.org.
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 5b9e7e87b8e84a9ed057db9ba54a2da6735b0440
Author: Elek Márton <el...@apache.org>
AuthorDate: Tue Jul 21 10:18:57 2020 +0200
asd
---
proto.lock | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/proto.lock b/proto.lock
new file mode 100644
index 0000000..e69de29
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org
[hadoop-ozone] 02/02: switch to use maven based ignore model
Posted by el...@apache.org.
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 <el...@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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org