Skip to content

Commit b559d67

Browse files
vam-googlevam-google
authored
Cleanup before protoc/grpc artifacts push (googleapis#3207)
(this is to separate cleanup changes from the actual proto/grpc artifacts push, which is huge) 1) Cleanup `pom.xml`s (remove unused/duplicate, partially wrong configuration) 2) Update `versions.txt` to include `proto/grpc` artifacts version (will be pushed immediately after this change is pushed). Also update `bump_versions.py` and `replace_versions.py` to strip whitespaces and support empty lines. 3) Fix License to pint explicitly to `Apache 2.0` license (instead of Google Software License, which contains apache license in it (did compare the text, it is identical). Otherwise all third-party tools do not recognize the license (including github, looks like). 4) Add Andrea and Hanzhen to developers list.
1 parent 9fbd6dc commit b559d67

25 files changed

Lines changed: 350 additions & 1398 deletions

File tree

‎google-cloud-bigquerydatatransfer/pom.xml‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -85,62 +85,4 @@
8585
<scope>test</scope>
8686
</dependency>
8787
</dependencies>
88-
<profiles>
89-
<profile>
90-
<id>doclint-java8-disable</id>
91-
<activation>
92-
<jdk>[1.8,)</jdk>
93-
</activation>
94-
<properties>
95-
<!-- add this to disable checking -->
96-
<javadoc.opts>-Xdoclint:none</javadoc.opts>
97-
</properties>
98-
</profile>
99-
</profiles>
100-
<build>
101-
<plugins>
102-
<plugin>
103-
<groupId>org.codehaus.mojo</groupId>
104-
<artifactId>build-helper-maven-plugin</artifactId>
105-
<version>1.9.1</version>
106-
<executions>
107-
<execution>
108-
<phase>generate-sources</phase>
109-
<goals><goal>add-source</goal></goals>
110-
<configuration>
111-
<sources>
112-
<source>generated/src/main/java</source>
113-
</sources>
114-
</configuration>
115-
</execution>
116-
</executions>
117-
</plugin>
118-
<plugin>
119-
<groupId>org.apache.maven.plugins</groupId>
120-
<artifactId>maven-javadoc-plugin</artifactId>
121-
<version>2.10.3</version>
122-
<executions>
123-
<execution>
124-
<id>attach-javadocs</id>
125-
<goals>
126-
<goal>jar</goal>
127-
</goals>
128-
<configuration>
129-
<additionalparam>${javadoc.opts}</additionalparam>
130-
</configuration>
131-
</execution>
132-
</executions>
133-
</plugin>
134-
<plugin>
135-
<artifactId>maven-compiler-plugin</artifactId>
136-
<version>3.5.1</version>
137-
<configuration>
138-
<source>1.7</source>
139-
<target>1.7</target>
140-
<encoding>UTF-8</encoding>
141-
<compilerArgument>-Xlint:unchecked</compilerArgument>
142-
</configuration>
143-
</plugin>
144-
</plugins>
145-
</build>
14688
</project>

‎google-cloud-bigtable/pom.xml‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,6 @@
111111
</profiles>
112112
<build>
113113
<plugins>
114-
<plugin>
115-
<groupId>org.codehaus.mojo</groupId>
116-
<artifactId>build-helper-maven-plugin</artifactId>
117-
<version>1.9.1</version>
118-
<executions>
119-
<execution>
120-
<phase>generate-sources</phase>
121-
<goals><goal>add-source</goal></goals>
122-
<configuration>
123-
<sources>
124-
<source>generated/src/main/java</source>
125-
</sources>
126-
</configuration>
127-
</execution>
128-
</executions>
129-
</plugin>
130114
<plugin>
131115
<groupId>org.apache.maven.plugins</groupId>
132116
<artifactId>maven-failsafe-plugin</artifactId>
@@ -145,32 +129,6 @@
145129
<threadCount>2</threadCount>
146130
</configuration>
147131
</plugin>
148-
<plugin>
149-
<groupId>org.apache.maven.plugins</groupId>
150-
<artifactId>maven-javadoc-plugin</artifactId>
151-
<version>2.10.3</version>
152-
<executions>
153-
<execution>
154-
<id>attach-javadocs</id>
155-
<goals>
156-
<goal>jar</goal>
157-
</goals>
158-
<configuration>
159-
<additionalparam>${javadoc.opts}</additionalparam>
160-
</configuration>
161-
</execution>
162-
</executions>
163-
</plugin>
164-
<plugin>
165-
<artifactId>maven-compiler-plugin</artifactId>
166-
<version>3.5.1</version>
167-
<configuration>
168-
<source>1.7</source>
169-
<target>1.7</target>
170-
<encoding>UTF-8</encoding>
171-
<compilerArgument>-Xlint:unchecked</compilerArgument>
172-
</configuration>
173-
</plugin>
174132
</plugins>
175133
</build>
176134
</project>

0 commit comments

Comments
 (0)