You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2017/11/11 00:51:39 UTC
[GitHub] sijie closed pull request #711: ISSUE #691: Move generated files into their own module
sijie closed pull request #711: ISSUE #691: Move generated files into their own module
URL: https://github.com/apache/bookkeeper/pull/711
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml
new file mode 100644
index 000000000..02bf4ce22
--- /dev/null
+++ b/bookkeeper-proto/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>bookkeeper</artifactId>
+ <groupId>org.apache.bookkeeper</groupId>
+ <version>4.6.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>bookkeeper-proto</artifactId>
+ <name>Apache BookKeeper :: Protocols</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- exclude generated file //-->
+ <exclude>**/DataFormats.java</exclude>
+ <exclude>**/BookkeeperProtocol.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>0.5.0</version>
+ <configuration>
+ <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}</protocArtifact>
+ <checkStaleness>true</checkStaleness>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/bookkeeper-server/src/main/proto/BookkeeperProtocol.proto b/bookkeeper-proto/src/main/proto/BookkeeperProtocol.proto
similarity index 100%
rename from bookkeeper-server/src/main/proto/BookkeeperProtocol.proto
rename to bookkeeper-proto/src/main/proto/BookkeeperProtocol.proto
diff --git a/bookkeeper-server/src/main/proto/DataFormats.proto b/bookkeeper-proto/src/main/proto/DataFormats.proto
similarity index 100%
rename from bookkeeper-server/src/main/proto/DataFormats.proto
rename to bookkeeper-proto/src/main/proto/DataFormats.proto
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 2adc3eeab..2dbef795a 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -35,10 +35,9 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>bookkeeper-proto</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -294,8 +293,6 @@
<configuration>
<excludes>
<!-- exclude generated file //-->
- <exclude>**/DataFormats.java</exclude>
- <exclude>**/BookkeeperProtocol.java</exclude>
<exclude>**/target/**/*</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.gitignore</exclude>
@@ -373,22 +370,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.xolstice.maven.plugins</groupId>
- <artifactId>protobuf-maven-plugin</artifactId>
- <version>0.5.0</version>
- <configuration>
- <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}</protocArtifact>
- <checkStaleness>true</checkStaleness>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${maven-checkstyle-plugin.version}</version>
diff --git a/pom.xml b/pom.xml
index 2e1cc9569..13cbabec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
</ciManagement>
<modules>
<module>buildtools</module>
+ <module>bookkeeper-proto</module>
<module>bookkeeper-common</module>
<module>bookkeeper-stats</module>
<module>bookkeeper-server</module>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services