Skip to content

Commit

Permalink
Don't use nar parent pom and clean up dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@cavemandaveman
cavemandaveman committed Jul 27, 2018
1 parent 310e45c commit 4ddce31
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 43 deletions.
6 changes: 3 additions & 3 deletions nifi-standardize-date-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<parent>
<groupId>com.nineteen04labs</groupId>
<artifactId>nifi-standardize-date-bundle</artifactId>
<version>18.07.3</version>
<version>18.07.4</version>
</parent>

<artifactId>nifi-standardize-date-nar</artifactId>
<version>18.07.3</version>
<version>18.07.4</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
Expand All @@ -34,7 +34,7 @@
<dependency>
<groupId>com.nineteen04labs</groupId>
<artifactId>nifi-standardize-date-processors</artifactId>
<version>18.07.3</version>
<version>18.07.4</version>
</dependency>
</dependencies>

Expand Down
80 changes: 47 additions & 33 deletions nifi-standardize-date-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,75 +20,89 @@
<parent>
<groupId>com.nineteen04labs</groupId>
<artifactId>nifi-standardize-date-bundle</artifactId>
<version>18.07.3</version>
<version>18.07.4</version>
</parent>

<artifactId>nifi-standardize-date-processors</artifactId>
<packaging>jar</packaging>

<properties>
<nifi.version>1.5.0</nifi.version>
<custom.avro.version>1.8.0.48p</custom.avro.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
<version>${nifi.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<!-- Import custom avro and its dependencies to handle union file types -->
<!-- Import custom avro that we built below to handle union file types -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.8.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/avro-1.8.0-zolyfarkas.jar</systemPath>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<version>${custom.avro.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.7.2</version>
</dependency>
<!-- End of custom avro and dependencies -->
<!-- Need newer Jackson lib for JsonFactory -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.6</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>${nifi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

<!-- Run 'mvn validate' to install this dependency to local m2 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${custom.avro.version}</version>
<packaging>jar</packaging>
<file>${project.basedir}/src/main/resources/avro-${custom.avro.version}-jar-with-dependencies.jar</file>
<generatePom>true</generatePom>
</configuration>
<executions>
<execution>
<id>install-jar-lib</id>
<goals>
<goal>install-file</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
Binary file removed nifi-standardize-date-processors/src/main/resources/avro-1.8.0-zolyfarkas.jar
View file
Binary file not shown.
Binary file added nifi-standardize-date-processors/src/main/resources/avro-1.8.0.48p-jar-with-dependencies.jar
View file
Binary file not shown.
32 changes: 25 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,38 @@
<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>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
<version>1.5.0</version>
</parent>

<groupId>com.nineteen04labs</groupId>
<artifactId>nifi-standardize-date-bundle</artifactId>
<version>18.07.3</version>
<version>18.07.4</version>
<packaging>pom</packaging>

<modules>
<module>nifi-standardize-date-processors</module>
<module>nifi-standardize-date-nar</module>
</modules>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
<version>1.2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 4ddce31

Please sign in to comment.