Skip to content

Commit 5f34f04

Browse files
julienledemkou
authored andcommitted
ARROW-297: Fix Arrow pom for release
Author: Julien Le Dem <julien@dremio.com> Closes apache#140 from julienledem/fix_pom_for_release and squashes the following commits: 9618eaf [Julien Le Dem] ARROW-297: Fix Arrow pom for release
1 parent 6bac4ae commit 5f34f04

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

format/pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<fbs.version>1.2.0-3f79e055</fbs.version>
2828
<flatc.download.skip>false</flatc.download.skip>
2929
<flatc.executable>${project.build.directory}/flatc-${os.detected.classifier}-${fbs.version}.exe</flatc.executable>
30+
<flatc.generated.files>${project.build.directory}/generated-sources/flatc</flatc.generated.files>
3031
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
3132
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
3233
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
@@ -51,7 +52,7 @@
5152
</extensions>
5253

5354
<plugins>
54-
<plugin>
55+
<plugin> <!-- download the flatbuffer compiler -->
5556
<groupId>org.apache.maven.plugins</groupId>
5657
<artifactId>maven-dependency-plugin</artifactId>
5758
<version>${maven-dependency-plugin.version}</version>
@@ -83,7 +84,7 @@
8384
<artifactId>exec-maven-plugin</artifactId>
8485
<version>1.4.0</version>
8586
<executions>
86-
<execution>
87+
<execution> <!-- make the flatbuffer compiler executable -->
8788
<id>script-chmod</id>
8889
<goals>
8990
<goal>exec</goal>
@@ -98,7 +99,7 @@
9899
<skip>${flatc.download.skip}</skip>
99100
</configuration>
100101
</execution>
101-
<execution>
102+
<execution> <!-- generate sources by executing the flatbuffer compiler -->
102103
<goals>
103104
<goal>exec</goal>
104105
</goals>
@@ -108,15 +109,15 @@
108109
<arguments>
109110
<argument>-j</argument>
110111
<argument>-o</argument>
111-
<argument>target/generated-sources/flatc</argument>
112+
<argument>${flatc.generated.files}</argument>
112113
<argument>../../format/Message.fbs</argument>
113114
<argument>../../format/File.fbs</argument>
114115
</arguments>
115116
</configuration>
116117
</execution>
117118
</executions>
118119
</plugin>
119-
<plugin>
120+
<plugin> <!-- add the license header to the generated files -->
120121
<groupId>com.mycila</groupId>
121122
<artifactId>license-maven-plugin</artifactId>
122123
<version>2.3</version>
@@ -135,26 +136,26 @@
135136
</execution>
136137
</executions>
137138
</plugin>
138-
<plugin>
139+
<plugin> <!-- add generated sources to classpath -->
139140
<groupId>org.codehaus.mojo</groupId>
140141
<artifactId>build-helper-maven-plugin</artifactId>
141142
<version>1.9.1</version>
142143
<executions>
143144
<execution>
144-
<id>add-sources-as-resources</id>
145+
<id>add-generated-sources-to-classpath</id>
145146
<phase>generate-sources</phase>
146147
<goals>
147148
<goal>add-source</goal>
148149
</goals>
149150
<configuration>
150151
<sources>
151-
<source>${project.build.directory}/generated-sources</source>
152+
<source>${flatc.generated.files}</source>
152153
</sources>
153154
</configuration>
154155
</execution>
155156
</executions>
156157
</plugin>
157-
<plugin>
158+
<plugin> <!-- no checkstyle on the generated code -->
158159
<groupId>org.apache.maven.plugins</groupId>
159160
<artifactId>maven-checkstyle-plugin</artifactId>
160161
<configuration>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.apache</groupId>
1818
<artifactId>apache</artifactId>
19-
<version>14</version>
19+
<version>18</version>
2020
</parent>
2121

2222
<groupId>org.apache.arrow</groupId>

0 commit comments

Comments
 (0)