Skip to content

Commit 9754499

Browse files
shinfanshinfan
authored
Fix build setup of project.properties (googleapis#2003)
- Add project.properties as a resource file - Process the resource file and inject the version information in the building stage In this way only the properties listed in the project.properties will be injected.
1 parent 3d321a1 commit 9754499

20 files changed

Lines changed: 392 additions & 227 deletions

File tree

‎google-cloud-bigquery/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,34 @@
6767
</dependency>
6868
</dependencies>
6969
<build>
70+
<resources>
71+
<resource>
72+
<directory>./..</directory>
73+
<filtering>true</filtering>
74+
<includes>
75+
<include>project.properties</include>
76+
</includes>
77+
</resource>
78+
</resources>
7079
<plugins>
71-
<plugin>
72-
<groupId>org.codehaus.mojo</groupId>
73-
<artifactId>properties-maven-plugin</artifactId>
74-
<version>1.0-alpha-2</version>
75-
<executions>
80+
<plugin>
81+
<artifactId>maven-antrun-plugin</artifactId>
82+
<version>1.4</version>
83+
<executions>
7684
<execution>
77-
<phase>generate-resources</phase>
78-
<goals>
79-
<goal>write-project-properties</goal>
80-
</goals>
85+
<phase>process-resources</phase>
8186
<configuration>
82-
<outputFile>${project.build.outputDirectory}/com/google/cloud/bigquery/project.properties</outputFile>
87+
<tasks>
88+
<copy file="${project.build.outputDirectory}/project.properties"
89+
toFile="${project.build.outputDirectory}/com/google/cloud/bigquery/project.properties"
90+
overwrite="true" />
91+
</tasks>
8392
</configuration>
93+
<goals>
94+
<goal>run</goal>
95+
</goals>
8496
</execution>
85-
</executions>
97+
</executions>
8698
</plugin>
8799
</plugins>
88100
</build>

‎google-cloud-compute/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,34 @@
6161
</dependency>
6262
</dependencies>
6363
<build>
64+
<resources>
65+
<resource>
66+
<directory>./..</directory>
67+
<filtering>true</filtering>
68+
<includes>
69+
<include>project.properties</include>
70+
</includes>
71+
</resource>
72+
</resources>
6473
<plugins>
65-
<plugin>
66-
<groupId>org.codehaus.mojo</groupId>
67-
<artifactId>properties-maven-plugin</artifactId>
68-
<version>1.0-alpha-2</version>
69-
<executions>
74+
<plugin>
75+
<artifactId>maven-antrun-plugin</artifactId>
76+
<version>1.4</version>
77+
<executions>
7078
<execution>
71-
<phase>generate-resources</phase>
72-
<goals>
73-
<goal>write-project-properties</goal>
74-
</goals>
79+
<phase>process-resources</phase>
7580
<configuration>
76-
<outputFile>${project.build.outputDirectory}/com/google/cloud/compute/project.properties</outputFile>
81+
<tasks>
82+
<copy file="${project.build.outputDirectory}/project.properties"
83+
toFile="${project.build.outputDirectory}/com/google/cloud/compute/project.properties"
84+
overwrite="true" />
85+
</tasks>
7786
</configuration>
87+
<goals>
88+
<goal>run</goal>
89+
</goals>
7890
</execution>
79-
</executions>
91+
</executions>
8092
</plugin>
8193
</plugins>
8294
</build>

‎google-cloud-core-grpc/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,4 @@
6969
<scope>test</scope>
7070
</dependency>
7171
</dependencies>
72-
<build>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.codehaus.mojo</groupId>
76-
<artifactId>properties-maven-plugin</artifactId>
77-
<version>1.0-alpha-2</version>
78-
<executions>
79-
<execution>
80-
<phase>generate-resources</phase>
81-
<goals>
82-
<goal>write-project-properties</goal>
83-
</goals>
84-
<configuration>
85-
<outputFile>${project.build.outputDirectory}/com/google/cloud/project.properties</outputFile>
86-
</configuration>
87-
</execution>
88-
</executions>
89-
</plugin>
90-
</plugins>
91-
</build>
9272
</project>

‎google-cloud-core-http/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,4 @@
109109
<scope>test</scope>
110110
</dependency>
111111
</dependencies>
112-
<build>
113-
<plugins>
114-
<plugin>
115-
<groupId>org.codehaus.mojo</groupId>
116-
<artifactId>properties-maven-plugin</artifactId>
117-
<version>1.0-alpha-2</version>
118-
<executions>
119-
<execution>
120-
<phase>generate-resources</phase>
121-
<goals>
122-
<goal>write-project-properties</goal>
123-
</goals>
124-
<configuration>
125-
<outputFile>${project.build.outputDirectory}/com/google/cloud/project.properties</outputFile>
126-
</configuration>
127-
</execution>
128-
</executions>
129-
</plugin>
130-
</plugins>
131-
</build>
132112
</project>

‎google-cloud-core/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,34 @@
8080
</dependency>
8181
</dependencies>
8282
<build>
83+
<resources>
84+
<resource>
85+
<directory>./..</directory>
86+
<filtering>true</filtering>
87+
<includes>
88+
<include>project.properties</include>
89+
</includes>
90+
</resource>
91+
</resources>
8392
<plugins>
84-
<plugin>
85-
<groupId>org.codehaus.mojo</groupId>
86-
<artifactId>properties-maven-plugin</artifactId>
87-
<version>1.0-alpha-2</version>
88-
<executions>
93+
<plugin>
94+
<artifactId>maven-antrun-plugin</artifactId>
95+
<version>1.4</version>
96+
<executions>
8997
<execution>
90-
<phase>generate-resources</phase>
91-
<goals>
92-
<goal>write-project-properties</goal>
93-
</goals>
98+
<phase>process-resources</phase>
9499
<configuration>
95-
<outputFile>${project.build.outputDirectory}/com/google/cloud/project.properties</outputFile>
100+
<tasks>
101+
<copy file="${project.build.outputDirectory}/project.properties"
102+
toFile="${project.build.outputDirectory}/com/google/cloud/project.properties"
103+
overwrite="true" />
104+
</tasks>
96105
</configuration>
106+
<goals>
107+
<goal>run</goal>
108+
</goals>
97109
</execution>
98-
</executions>
110+
</executions>
99111
</plugin>
100112
</plugins>
101113
</build>

‎google-cloud-datastore/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,34 @@
6565
</dependency>
6666
</dependencies>
6767
<build>
68+
<resources>
69+
<resource>
70+
<directory>./..</directory>
71+
<filtering>true</filtering>
72+
<includes>
73+
<include>project.properties</include>
74+
</includes>
75+
</resource>
76+
</resources>
6877
<plugins>
69-
<plugin>
70-
<groupId>org.codehaus.mojo</groupId>
71-
<artifactId>properties-maven-plugin</artifactId>
72-
<version>1.0-alpha-2</version>
73-
<executions>
78+
<plugin>
79+
<artifactId>maven-antrun-plugin</artifactId>
80+
<version>1.4</version>
81+
<executions>
7482
<execution>
75-
<phase>generate-resources</phase>
76-
<goals>
77-
<goal>write-project-properties</goal>
78-
</goals>
83+
<phase>process-resources</phase>
7984
<configuration>
80-
<outputFile>${project.build.outputDirectory}/com/google/cloud/datastore/project.properties</outputFile>
85+
<tasks>
86+
<copy file="${project.build.outputDirectory}/project.properties"
87+
toFile="${project.build.outputDirectory}/com/google/cloud/datastore/project.properties"
88+
overwrite="true" />
89+
</tasks>
8190
</configuration>
91+
<goals>
92+
<goal>run</goal>
93+
</goals>
8294
</execution>
83-
</executions>
95+
</executions>
8496
</plugin>
8597
</plugins>
8698
</build>

‎google-cloud-dns/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,34 @@
7272
</dependency>
7373
</dependencies>
7474
<build>
75+
<resources>
76+
<resource>
77+
<directory>./..</directory>
78+
<filtering>true</filtering>
79+
<includes>
80+
<include>project.properties</include>
81+
</includes>
82+
</resource>
83+
</resources>
7584
<plugins>
76-
<plugin>
77-
<groupId>org.codehaus.mojo</groupId>
78-
<artifactId>properties-maven-plugin</artifactId>
79-
<version>1.0-alpha-2</version>
80-
<executions>
85+
<plugin>
86+
<artifactId>maven-antrun-plugin</artifactId>
87+
<version>1.4</version>
88+
<executions>
8189
<execution>
82-
<phase>generate-resources</phase>
83-
<goals>
84-
<goal>write-project-properties</goal>
85-
</goals>
90+
<phase>process-resources</phase>
8691
<configuration>
87-
<outputFile>${project.build.outputDirectory}/com/google/cloud/dns/project.properties</outputFile>
92+
<tasks>
93+
<copy file="${project.build.outputDirectory}/project.properties"
94+
toFile="${project.build.outputDirectory}/com/google/cloud/dns/project.properties"
95+
overwrite="true" />
96+
</tasks>
8897
</configuration>
98+
<goals>
99+
<goal>run</goal>
100+
</goals>
89101
</execution>
90-
</executions>
102+
</executions>
91103
</plugin>
92104
</plugins>
93105
</build>

‎google-cloud-errorreporting/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,34 @@
9292
</profile>
9393
</profiles>
9494
<build>
95+
<resources>
96+
<resource>
97+
<directory>./..</directory>
98+
<filtering>true</filtering>
99+
<includes>
100+
<include>project.properties</include>
101+
</includes>
102+
</resource>
103+
</resources>
95104
<plugins>
96-
<plugin>
97-
<groupId>org.codehaus.mojo</groupId>
98-
<artifactId>properties-maven-plugin</artifactId>
99-
<version>1.0-alpha-2</version>
100-
<executions>
105+
<plugin>
106+
<artifactId>maven-antrun-plugin</artifactId>
107+
<version>1.4</version>
108+
<executions>
101109
<execution>
102-
<phase>generate-resources</phase>
103-
<goals>
104-
<goal>write-project-properties</goal>
105-
</goals>
110+
<phase>process-resources</phase>
106111
<configuration>
107-
<outputFile>${project.build.outputDirectory}/com/google/cloud/errorreporting/project.properties</outputFile>
112+
<tasks>
113+
<copy file="${project.build.outputDirectory}/project.properties"
114+
toFile="${project.build.outputDirectory}/com/google/cloud/errorreporting/project.properties"
115+
overwrite="true" />
116+
</tasks>
108117
</configuration>
118+
<goals>
119+
<goal>run</goal>
120+
</goals>
109121
</execution>
110-
</executions>
122+
</executions>
111123
</plugin>
112124
<plugin>
113125
<groupId>org.codehaus.mojo</groupId>

‎google-cloud-language/pom.xml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,34 @@
103103
</profile>
104104
</profiles>
105105
<build>
106+
<resources>
107+
<resource>
108+
<directory>./..</directory>
109+
<filtering>true</filtering>
110+
<includes>
111+
<include>project.properties</include>
112+
</includes>
113+
</resource>
114+
</resources>
106115
<plugins>
107-
<plugin>
108-
<groupId>org.codehaus.mojo</groupId>
109-
<artifactId>properties-maven-plugin</artifactId>
110-
<version>1.0-alpha-2</version>
111-
<executions>
116+
<plugin>
117+
<artifactId>maven-antrun-plugin</artifactId>
118+
<version>1.4</version>
119+
<executions>
112120
<execution>
113-
<phase>generate-resources</phase>
114-
<goals>
115-
<goal>write-project-properties</goal>
116-
</goals>
121+
<phase>process-resources</phase>
117122
<configuration>
118-
<outputFile>${project.build.outputDirectory}/com/google/cloud/language/project.properties</outputFile>
123+
<tasks>
124+
<copy file="${project.build.outputDirectory}/project.properties"
125+
toFile="${project.build.outputDirectory}/com/google/cloud/language/project.properties"
126+
overwrite="true" />
127+
</tasks>
119128
</configuration>
129+
<goals>
130+
<goal>run</goal>
131+
</goals>
120132
</execution>
121-
</executions>
133+
</executions>
122134
</plugin>
123135
<plugin>
124136
<groupId>org.codehaus.mojo</groupId>

0 commit comments

Comments
 (0)