mirror of https://github.com/apache/nifi.git
NIFI-8767 fixing conflicting/not needed declarations from former subproject poms for registry and minifi
This commit is contained in:
Joe Witt
parent
aedbd0d753
commit
b75965d08f
|
|
@ -40,56 +40,7 @@ limitations under the License.
|
|||
<module>minifi-c2</module>
|
||||
<module>minifi-integration-tests</module>
|
||||
</modules>
|
||||
|
||||
<url>https://nifi.apache.org/minifi</url>
|
||||
<organization>
|
||||
<name>Apache NiFi Project - MiNiFi subproject</name>
|
||||
<url>https://nifi.apache.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Dev</name>
|
||||
<subscribe>dev-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>dev-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>dev@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-dev</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Users</name>
|
||||
<subscribe>users-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>users-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>users@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-users</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Commits</name>
|
||||
<subscribe>commits-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>commits-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>commits@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-commits</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
<prerequisites>
|
||||
<maven>${maven.min-version}</maven>
|
||||
</prerequisites>
|
||||
<scm>
|
||||
<connection>scm:git:git://git.apache.org/nifi.git</connection>
|
||||
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/nifi.git</developerConnection>
|
||||
<url>https://gitbox.apache.org/repos/asf?p=nifi.git</url>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
<issueManagement>
|
||||
<system>JIRA</system>
|
||||
<url>https://issues.apache.org/jira/browse/MINIFI</url>
|
||||
</issueManagement>
|
||||
<properties>
|
||||
<inceptionYear>2016</inceptionYear>
|
||||
<jersey.version>2.29</jersey.version>
|
||||
<spring.version>5.3.8</spring.version>
|
||||
<spring.security.version>5.4.6</spring.security.version>
|
||||
|
|
|
|||
|
|
@ -35,61 +35,7 @@
|
|||
<module>nifi-registry-toolkit</module>
|
||||
<module>nifi-registry-docker-maven</module>
|
||||
</modules>
|
||||
<url>https://nifi.apache.org/registry.html</url>
|
||||
<organization>
|
||||
<name>Apache NiFi Project</name>
|
||||
<url>https://nifi.apache.org/</url>
|
||||
</organization>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache License, Version 2.0</name>
|
||||
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Dev</name>
|
||||
<subscribe>dev-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>dev-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>dev@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-dev</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Users</name>
|
||||
<subscribe>users-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>users-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>users@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-users</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Commits</name>
|
||||
<subscribe>commits-subscribe@nifi.apache.org</subscribe>
|
||||
<unsubscribe>commits-unsubscribe@nifi.apache.org</unsubscribe>
|
||||
<post>commits@nifi.apache.org</post>
|
||||
<archive>https://mail-archives.apache.org/mod_mbox/nifi-commits</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
<prerequisites>
|
||||
<maven>${maven.min-version}</maven>
|
||||
</prerequisites>
|
||||
<scm>
|
||||
<connection>scm:git:git://git.apache.org/nifi-registry.git</connection>
|
||||
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/nifi-registry.git</developerConnection>
|
||||
<url>https://git-wip-us.apache.org/repos/asf?p=nifi-registry.git</url>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
<issueManagement>
|
||||
<system>JIRA</system>
|
||||
<url>https://issues.apache.org/jira/browse/NIFIREG</url>
|
||||
</issueManagement>
|
||||
<properties>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.min-version>3.1.0</maven.min-version>
|
||||
<maven.surefire.arguments />
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<inceptionYear>2017</inceptionYear>
|
||||
<jax.rs.api.version>2.1</jax.rs.api.version>
|
||||
<spring.boot.version>2.5.1</spring.boot.version>
|
||||
<spring.version>5.3.8</spring.version>
|
||||
|
|
@ -104,43 +50,6 @@
|
|||
<jgit.version>5.11.1.202105131744-r</jgit.version>
|
||||
</properties>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>central</id>
|
||||
<!-- This should be at top, it makes maven try the central repo
|
||||
first and then others and hence faster dep resolution -->
|
||||
<name>Maven Repository</name>
|
||||
<url>https://repo1.maven.org/maven2</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>apache-repo</id>
|
||||
<name>Apache Repository</name>
|
||||
<url>https://repository.apache.org/content/repositories/releases</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>jcenter</id>
|
||||
<url>https://jcenter.bintray.com</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>jcenter-releases</id>
|
||||
|
|
@ -362,17 +271,6 @@
|
|||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
<optimize>true</optimize>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
<showWarnings>true</showWarnings>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy-eclipse-compiler</artifactId>
|
||||
|
|
@ -449,11 +347,6 @@
|
|||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>1.3.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
|
|
@ -473,42 +366,6 @@
|
|||
<additionalJOption>-J-Xmx512m</additionalJOption>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<configuration>
|
||||
<useReleaseProfile>true</useReleaseProfile>
|
||||
<releaseProfiles>apache-release</releaseProfiles>
|
||||
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||
<goals>deploy</goals>
|
||||
<!--suppress UnresolvedMavenProperty -->
|
||||
<tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
|
||||
<pushChanges>false</pushChanges>
|
||||
<localCheckout>true</localCheckout>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default</id>
|
||||
<goals>
|
||||
<goal>perform</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<pomFileName>pom.xml</pomFileName>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>rpm-maven-plugin</artifactId>
|
||||
<version>2.1.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>buildnumber-maven-plugin</artifactId>
|
||||
<version>1.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
|
|
@ -557,17 +414,6 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.5</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
|
||||
<serverId>repository.apache.org</serverId>
|
||||
<nexusUrl>https://repository.apache.org/</nexusUrl>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
|
|
@ -586,9 +432,6 @@
|
|||
<plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
|
||||
</plugins>
|
||||
</requireSameVersions>
|
||||
<requireMavenVersion>
|
||||
<version>${maven.min-version}</version>
|
||||
</requireMavenVersion>
|
||||
</rules>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
|||
Loading…
Reference in New Issue