Skip to content

Commit

Permalink
NIFI-10272-RC2 prepare for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
joewitt committed Jul 27, 2022
1 parent 8d25678 commit 8c66bf9
Show file tree
Hide file tree
Showing 659 changed files with 2,254 additions and 4,812 deletions.
8 changes: 2 additions & 6 deletions c2/c2-client-bundle/c2-client-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-client-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-client-api</artifactId>
Expand All @@ -31,11 +31,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
10 changes: 3 additions & 7 deletions c2/c2-client-bundle/c2-client-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-client-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-client-base</artifactId>
Expand All @@ -31,13 +31,13 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -52,8 +52,4 @@ limitations under the License.
<artifactId>jackson-annotations</artifactId>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
10 changes: 3 additions & 7 deletions c2/c2-client-bundle/c2-client-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-client-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-client-http</artifactId>
Expand All @@ -31,12 +31,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-base</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand All @@ -53,8 +53,4 @@ limitations under the License.
<scope>test</scope>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
13 changes: 4 additions & 9 deletions c2/c2-client-bundle/c2-client-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-client-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-client-service</artifactId>
Expand All @@ -31,22 +31,17 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-base</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-client-http</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
</dependencies>


<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions c2/c2-client-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-client-bundle</artifactId>
Expand All @@ -33,8 +33,4 @@ limitations under the License.
<module>c2-client-http</module>
<module>c2-client-service</module>
</modules>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
8 changes: 2 additions & 6 deletions c2/c2-protocol/c2-protocol-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-protocol</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-protocol-api</artifactId>
Expand All @@ -31,11 +31,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-component-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions c2/c2-protocol/c2-protocol-component-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>c2-protocol</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -37,8 +37,4 @@ limitations under the License.
<scope>compile</scope>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions c2/c2-protocol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2-protocol</artifactId>
Expand All @@ -31,8 +31,4 @@ limitations under the License.
<module>c2-protocol-component-api</module>
<module>c2-protocol-api</module>
</modules>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
4 changes: 2 additions & 2 deletions c2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>nifi</artifactId>
<groupId>org.apache.nifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<artifactId>c2</artifactId>
Expand All @@ -37,7 +37,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
10 changes: 3 additions & 7 deletions minifi/minifi-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-assembly</artifactId>
<packaging>pom</packaging>
Expand Down Expand Up @@ -128,13 +128,13 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-nar</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-server-nar</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -457,8 +457,4 @@ limitations under the License.
</build>
</profile>
</profiles>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions minifi/minifi-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-bootstrap</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -126,8 +126,4 @@ limitations under the License.
</plugin>
</plugins>
</build>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions minifi/minifi-c2/minifi-c2-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-api</artifactId>
<packaging>jar</packaging>
Expand All @@ -43,8 +43,4 @@ limitations under the License.
<scope>provided</scope>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions minifi/minifi-c2/minifi-c2-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-assembly</artifactId>
<packaging>pom</packaging>
Expand Down Expand Up @@ -222,8 +222,4 @@ limitations under the License.
</build>
</profile>
</profiles>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-cache</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache-filesystem</artifactId>
<packaging>jar</packaging>
Expand All @@ -38,8 +38,4 @@ limitations under the License.
<scope>test</scope>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-cache</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache-s3</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -51,8 +51,4 @@ limitations under the License.
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
6 changes: 1 addition & 5 deletions minifi/minifi-c2/minifi-c2-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache</artifactId>
<packaging>pom</packaging>
Expand All @@ -29,8 +29,4 @@ limitations under the License.
<module>minifi-c2-cache-filesystem</module>
<module>minifi-c2-cache-s3</module>
</modules>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
8 changes: 2 additions & 6 deletions minifi/minifi-c2/minifi-c2-docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-c2</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-c2-docker</artifactId>
<version>1.17.0</version>
<version>1.18.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -76,8 +76,4 @@ limitations under the License.
</build>
</profile>
</profiles>

<scm>
<tag>nifi-1.17.0-RC2</tag>
</scm>
</project>
Loading

0 comments on commit 8c66bf9

Please sign in to comment.