Skip to content

Commit 05e2e2c

Browse files
author
Vladimir Kotal
committed
tools should have its own Maven module
fixes #2242
1 parent aba5f4c commit 05e2e2c

31 files changed

+88
-28
lines changed

distribution/assembly.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</includes>
4141
</fileSet>
4242
<fileSet>
43-
<directory>${project.basedir}/../tools</directory>
43+
<directory>${project.basedir}/../tools/src/main/python</directory>
4444
<outputDirectory>bin</outputDirectory>
4545
<includes>
4646
<include>*.py</include>

distribution/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
<version>1.1-rc35</version>
3434
<type>war</type>
3535
</dependency>
36+
37+
<dependency>
38+
<groupId>org.opengrok</groupId>
39+
<artifactId>tools</artifactId>
40+
<version>1.1-rc35</version>
41+
</dependency>
3642
</dependencies>
3743

3844
<build>

opengrok-indexer/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -305,33 +305,10 @@ Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
305305
</configuration>
306306
</plugin>
307307

308-
<plugin>
309-
<groupId>org.codehaus.mojo</groupId>
310-
<artifactId>exec-maven-plugin</artifactId>
311-
<version>1.6.0</version>
312-
<executions>
313-
<execution>
314-
<phase>verify</phase>
315-
<goals>
316-
<goal>exec</goal>
317-
</goals>
318-
</execution>
319-
</executions>
320-
<configuration>
321-
<executable>flake8</executable>
322-
<arguments>
323-
<argument>-v</argument>
324-
<argument>--exclude=filelock.py,test_command.py,test_commands.py</argument>
325-
<argument>${project.basedir}/../tools</argument>
326-
</arguments>
327-
</configuration>
328-
</plugin>
329-
330308
<plugin>
331309
<groupId>org.apache.maven.plugins</groupId>
332310
<artifactId>maven-checkstyle-plugin</artifactId>
333311
</plugin>
334-
335312
</plugins>
336313
</build>
337314

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
5151
<module>opengrok-web</module>
5252
<module>distribution</module>
5353
<module>suggester</module>
54+
<module>tools</module>
5455
</modules>
5556

5657
<scm>

tools/pom.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
CDDL HEADER START
5+
6+
The contents of this file are subject to the terms of the
7+
Common Development and Distribution License (the "License").
8+
You may not use this file except in compliance with the License.
9+
10+
See LICENSE.txt included in this distribution for the specific
11+
language governing permissions and limitations under the License.
12+
13+
When distributing Covered Code, include this CDDL HEADER in each
14+
file and include the License file at LICENSE.txt.
15+
If applicable, add the following below this CDDL HEADER, with the
16+
fields enclosed by brackets "[]" replaced with your own identifying
17+
information: Portions Copyright [yyyy] [name of copyright owner]
18+
19+
CDDL HEADER END
20+
21+
Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
22+
Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
23+
24+
-->
25+
<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/maven-v4_0_0.xsd">
26+
<modelVersion>4.0.0</modelVersion>
27+
28+
<parent>
29+
<groupId>org.opengrok</groupId>
30+
<artifactId>opengrok-top</artifactId>
31+
<version>1.1-rc35</version>
32+
</parent>
33+
34+
<artifactId>tools</artifactId>
35+
<version>1.1-rc35</version>
36+
<packaging>pom</packaging>
37+
38+
<name>OpenGrok tools</name>
39+
40+
<build>
41+
<sourceDirectory>src/main/python</sourceDirectory>
42+
<testSourceDirectory>src/test/python</testSourceDirectory>
43+
44+
<plugins>
45+
<plugin>
46+
<groupId>org.codehaus.mojo</groupId>
47+
<artifactId>exec-maven-plugin</artifactId>
48+
<version>1.6.0</version>
49+
<executions>
50+
<execution>
51+
<phase>verify</phase>
52+
<goals>
53+
<goal>exec</goal>
54+
</goals>
55+
</execution>
56+
</executions>
57+
<configuration>
58+
<executable>flake8</executable>
59+
<arguments>
60+
<argument>-v</argument>
61+
<argument>--exclude=filelock.py,test_command.py,test_commands.py</argument>
62+
<argument>${project.build.sourceDirectory}</argument>
63+
</arguments>
64+
</configuration>
65+
</plugin>
66+
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-checkstyle-plugin</artifactId>
70+
</plugin>
71+
</plugins>
72+
</build>
73+
74+
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)