Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-272: Updated pom.xml to be more consistent by removing 'name' tag and not including the default 'properties' tag

This commit is contained in:
Mark Payne 2015-01-23 12:12:30 -05:00
parent c8ecdd9ddf 5f3653b342
commit cd3094d54f
9 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
View File

@ -22,5 +22,28 @@
<artifactId>nifi-maven-archetypes</artifactId> <artifactId>nifi-maven-archetypes</artifactId>
<version>0.0.1-incubating-SNAPSHOT</version> <version>0.0.1-incubating-SNAPSHOT</version>
</parent> </parent>
<artifactId>nifi-processor-bundle-archetype</artifactId> <artifactId>nifi-processor-bundle-archetype</artifactId>
<packaging>maven-archetype</packaging>
<build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.2</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project> </project>

56
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View File

@ -13,42 +13,28 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<archetype-descriptor name="nifi-${artifactId}-bundle"> <archetype-descriptor name="${artifactId}">
<requiredProperties> <requiredProperties>
<requiredProperty key="nifiVersion" > <requiredProperty key="artifactBaseName" />
<requiredProperty key="nifiVersion" >
<defaultValue>0.0.1-incubating-SNAPSHOT</defaultValue> <defaultValue>0.0.1-incubating-SNAPSHOT</defaultValue>
</requiredProperty> </requiredProperty>
</requiredProperties> </requiredProperties>
<modules> <fileSets>
<module id="nifi-${rootArtifactId}-processors" dir="nifi-__rootArtifactId__-processors" name="nifi-${rootArtifactId}-processors"> <fileSet filtered="true" packaged="false" encoding="UTF-8">
<fileSets> <directory>nifi-__artifactBaseName__-processors</directory>
<fileSet filtered="true" packaged="false" encoding="UTF-8"> <excludes>
<directory>src/main/java</directory> <exclude>**/*.java</exclude>
<includes> </excludes>
<include>**/*.java</include> </fileSet>
</includes> <fileSet filtered="true" packaged="true" encoding="UTF-8">
</fileSet> <directory>nifi-__artifactBaseName__-processors/src/main/java</directory>
<fileSet encoding="UTF-8"> </fileSet>
<directory>src/main/resources</directory> <fileSet filtered="true" packaged="true" encoding="UTF-8">
<includes> <directory>nifi-__artifactBaseName__-processors/src/test/java</directory>
<include>**/*.Processor</include> </fileSet>
<include>**/index.html</include> <fileSet filtered="true" packaged="false" encoding="UTF-8">
</includes> <directory>nifi-__artifactBaseName__-nar</directory>
</fileSet> </fileSet>
<fileSet filtered="true" packaged="false" encoding="UTF-8"> </fileSets>
<directory>src/test/java</directory> </archetype-descriptor>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
</fileSets>
</module>
<module id="nifi-${rootArtifactId}-nar" dir="nifi-__rootArtifactId__-nar" name="nifi-${rootArtifactId}-nar">
<fileSets>
<fileSet encoding="UTF-8">
<directory></directory>
</fileSet>
</fileSets>
</module>
</modules>
</archetype-descriptor>

6
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-nar/pom.xml → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-nar/pom.xml
View File

@ -18,18 +18,18 @@
<parent> <parent>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>nifi-${rootArtifactId}-bundle</artifactId> <artifactId>${rootArtifactId}</artifactId>
<version>${version}</version> <version>${version}</version>
</parent> </parent>
<artifactId>${artifactId}</artifactId> <artifactId>nifi-${artifactBaseName}-nar</artifactId>
<version>${version}</version> <version>${version}</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>nifi-${rootArtifactId}-processors</artifactId> <artifactId>nifi-${artifactBaseName}-processors</artifactId>
<version>${version}</version> <version>${version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-processors/pom.xml → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml
View File

@ -18,11 +18,11 @@
<parent> <parent>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>nifi-${rootArtifactId}-bundle</artifactId> <artifactId>${rootArtifactId}</artifactId>
<version>${version}</version> <version>${version}</version>
</parent> </parent>
<artifactId>${artifactId}</artifactId> <artifactId>nifi-${artifactBaseName}-processors</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>

2
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-processors/src/main/java/org/apache/nifi/processors/MyProcessor.java → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/java/MyProcessor.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.nifi.processors; package ${package};
import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue; import org.apache.nifi.components.PropertyValue;

2
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor
View File

@ -12,4 +12,4 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
org.apache.nifi.processors.MyProcessor ${package}.MyProcessor

0
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-processors/src/main/resources/docs/org.apache.nifi.processors.MyProcessor/index.html → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/main/resources/docs/__package__.MyProcessor/index.html
View File

2
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__rootArtifactId__-processors/src/test/java/org/apache/nifi/processors/MyProcessorTest.java → nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.nifi.processors; package ${package};
import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners; import org.apache.nifi.util.TestRunners;

6
nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -23,13 +23,13 @@
</parent> </parent>
<groupId>${groupId}</groupId> <groupId>${groupId}</groupId>
<artifactId>nifi-${artifactId}-bundle</artifactId> <artifactId>${artifactId}</artifactId>
<version>${version}</version> <version>${version}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>nifi-${rootArtifactId}-processors</module> <module>nifi-${artifactBaseName}-processors</module>
<module>nifi-${rootArtifactId}-nar</module> <module>nifi-${artifactBaseName}-nar</module>
</modules> </modules>
</project> </project>