Explorar el Código

Add Lombok and Spotless + upgrade to Nifi v2.0

Frédéric Praca hace 10 meses
padre
commit
c0df606687
Se han modificado 3 ficheros con 65 adiciones y 37 borrados
  1. 2 2
      nifi-xmpp-nar/pom.xml
  2. 60 32
      nifi-xmpp-processors/pom.xml
  3. 3 3
      pom.xml

+ 2 - 2
nifi-xmpp-nar/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>fr.chickenkiller.nifi</groupId>
         <artifactId>nifi-xmpp-processor</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>nifi-xmpp-nar</artifactId>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>fr.chickenkiller.nifi</groupId>
             <artifactId>nifi-xmpp-processors</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
     </dependencies>
 

+ 60 - 32
nifi-xmpp-processors/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>fr.chickenkiller.nifi</groupId>
 		<artifactId>nifi-xmpp-processor</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0</version>
 	</parent>
 
 	<artifactId>nifi-xmpp-processors</artifactId>
@@ -29,38 +29,11 @@
 
 	<properties>
 		<smack.version>4.4.8</smack.version>
+		<spotless.version>2.43.0</spotless.version>
+		<lombok.version>1.18.32</lombok.version>
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.nifi</groupId>
-			<artifactId>nifi-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.nifi</groupId>
-			<artifactId>nifi-utils</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.nifi</groupId>
-			<artifactId>nifi-mock</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.igniterealtime.smack</groupId>
 			<artifactId>smack-tcp</artifactId>
@@ -68,13 +41,68 @@
 		</dependency>
 		<dependency>
 			<groupId>org.igniterealtime.smack</groupId>
-			<artifactId>smack-tcp</artifactId>
+			<artifactId>smack-java8</artifactId>
 			<version>${smack.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.igniterealtime.smack</groupId>
-			<artifactId>smack-java8</artifactId>
+			<artifactId>smack-extensions</artifactId>
 			<version>${smack.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.diffplug.spotless</groupId>
+			<artifactId>spotless-maven-plugin</artifactId>
+			<version>${spotless.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${lombok.version}</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.diffplug.spotless</groupId>
+				<artifactId>spotless-maven-plugin</artifactId>
+				<version>${spotless.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<!-- define a language-specific format -->
+					<java>
+						<importOrder />
+						<removeUnusedImports />
+
+						<palantirJavaFormat>
+							<version>2.39.0</version>
+							<style>PALANTIR</style>
+							<formatJavadoc>true</formatJavadoc>
+						</palantirJavaFormat>
+
+						<formatAnnotations />
+					</java>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

+ 3 - 3
pom.xml

@@ -18,13 +18,13 @@
 
     <parent>
         <groupId>org.apache.nifi</groupId>
-        <artifactId>nifi-nar-bundles</artifactId>
-        <version>1.25.0</version>
+	<artifactId>nifi-standard-shared-bom</artifactId>
+	<version>2.0.0</version>
     </parent>
 
     <groupId>fr.chickenkiller.nifi</groupId>
     <artifactId>nifi-xmpp-processor</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>pom</packaging>
 
     <modules>