nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joew...@apache.org
Subject incubator-nifi git commit: NIFI-270 updating poms approaching release - about to practice another staging build
Date Fri, 16 Jan 2015 17:00:15 GMT
Repository: incubator-nifi
Updated Branches:
  refs/heads/nifi-270-release-setup 314241ba8 -> a2f63c7c8


NIFI-270 updating poms approaching release - about to practice another staging build


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a2f63c7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a2f63c7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a2f63c7c

Branch: refs/heads/nifi-270-release-setup
Commit: a2f63c7c886495ccee52a448e7a9625ad65ad1f9
Parents: 314241b
Author: joewitt <joewitt@apache.org>
Authored: Fri Jan 16 11:59:49 2015 -0500
Committer: joewitt <joewitt@apache.org>
Committed: Fri Jan 16 11:59:49 2015 -0500

----------------------------------------------------------------------
 maven-plugins/nar-maven-plugin/pom.xml |  91 +++++++++++++++-------
 nifi/pom.xml                           | 114 ++++++++--------------------
 2 files changed, 93 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a2f63c7c/maven-plugins/nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml
index b176de6..5c9bc62 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -59,8 +59,8 @@
         <connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
         <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
     <issueManagement>
         <system>JIRA</system>
         <url>https://issues.apache.org/jira/browse/NIFI</url>
@@ -68,7 +68,7 @@
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.version>3.0.5</maven.version>
+        <maven.min-version>3.0.5</maven.min-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -144,24 +144,24 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.5.1</version>
                     <configuration>
-                      <useReleaseProfile>true</useReleaseProfile>
-                      <releaseProfiles>apache-release</releaseProfiles>
-                      <autoVersionSubmodules>true</autoVersionSubmodules>
-                      <goals>deploy</goals>
-                      <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
-                      <pushChanges>false</pushChanges>
-                      <localCheckout>true</localCheckout>
+                        <useReleaseProfile>true</useReleaseProfile>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <goals>deploy</goals>
+                        <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>maven-plugins/nar-maven-plugin/pom.xml</pomFileName>
-                        </configuration>
-                      </execution>
+                        <execution>
+                            <id>default</id>
+                            <goals>
+                                <goal>perform</goal>
+                            </goals>
+                            <configuration>
+                                <pomFileName>maven-plugins/nar-maven-plugin/pom.xml</pomFileName>
+                            </configuration>
+                        </execution>
                     </executions>
                 </plugin>
                 <plugin>
@@ -179,16 +179,16 @@
             </plugins>
         </pluginManagement>       
         <plugins>
-           <plugin>
-             <groupId>org.sonatype.plugins</groupId>
-             <artifactId>nexus-staging-maven-plugin</artifactId>
-             <version>1.6.5</version>
-             <extensions>true</extensions>
-             <configuration>
-               <serverId>repository.apache.org</serverId>
-               <nexusUrl>https://repository.apache.org/</nexusUrl>
-             </configuration>
-           </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.5</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>repository.apache.org</serverId>
+                    <nexusUrl>https://repository.apache.org/</nexusUrl>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
@@ -209,6 +209,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>nb-configuration.xml</exclude>
+                        <exclude>nbactions.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>                    
@@ -237,4 +247,27 @@
             <version>3.3</version>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <!-- Automatically check for licenses.
+            Activate with -P check-licenses -->
+            <id>check-licenses</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <phase>verify</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a2f63c7c/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index e74d2be..d6d312d 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -19,6 +19,7 @@
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>16</version>
+        <relativePath />
     </parent>
     <groupId>org.apache.nifi</groupId>
     <artifactId>nifi-parent</artifactId>
@@ -53,13 +54,8 @@
             <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive>
         </mailingList>
     </mailingLists>
-    <!--
-      ! This marked as deprecated for Maven 3.X. This is checked by maven-enforcer-plugin
-      ! http://jira.codehaus.org/browse/MNG-4840
-      ! http://jira.codehaus.org/browse/MNG-5297
-    -->
     <prerequisites>
-        <maven>${maven.version}</maven>
+        <maven>${maven.min-version}</maven>
     </prerequisites>
     <modules>
         <module>commons</module>
@@ -74,6 +70,7 @@
         <connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
         <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
+        <tag>HEAD</tag>
     </scm>
     <issueManagement>
         <system>JIRA</system>
@@ -82,7 +79,7 @@
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.version>3.0.5</maven.version>
+        <maven.min-version>3.0.5</maven.min-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <org.slf4j.version>1.7.8</org.slf4j.version>
@@ -91,7 +88,6 @@
         <spring.version>4.1.2.RELEASE</spring.version>
         <spring.security.version>3.2.5.RELEASE</spring.security.version>
         <jersey.version>1.18.3</jersey.version>
-        <sealJars>false</sealJars>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -894,7 +890,6 @@
                     <configuration>
                         <archive>
                             <manifestEntries>
-                                <Sealed>${sealJars}</Sealed>
                                 <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
                             </manifestEntries>
                         </archive>
@@ -919,16 +914,25 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.5.1</version>
                     <configuration>
-                        <arguments>-P apache-release,check-licenses</arguments>
+                        <useReleaseProfile>true</useReleaseProfile>
+                        <releaseProfiles>apache-release</releaseProfiles>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <goals>clean compile javadoc:aggregate deploy</goals>
-                        <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
-                        <tagNameFormat>@{project.version}</tagNameFormat>
-                        <releaseProfiles>seal-jars</releaseProfiles>
-                        <useReleaseProfile>false</useReleaseProfile>
+                        <goals>deploy</goals>
+                        <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>nifi/pom.xml</pomFileName>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -944,6 +948,16 @@
         </pluginManagement>
         <plugins>
             <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.5</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <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>
                 <executions>
@@ -962,7 +976,7 @@
                                     </plugins>
                                 </requireSameVersions>
                                 <requireMavenVersion>
-                                    <version>${maven.version}</version>
+                                    <version>${maven.min-version}</version>
                                 </requireMavenVersion>
                             </rules>    
                         </configuration>
@@ -988,79 +1002,13 @@
             <plugin>
                 <groupId>org.apache.nifi</groupId>
                 <artifactId>nar-maven-plugin</artifactId>
-                <version>0.0.2-test-incubating-SNAPSHOT</version>
+                <version>0.0.2-test-incubating</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>
     </build>
     <profiles>
         <profile>
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0.4</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>source-release-assembly</id>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                    <finalName>nifi-${project.version}</finalName>
-                                    <descriptorRefs>
-                                        <descriptorRef>source-release-zip-tar</descriptorRef>
-                                    </descriptorRefs>
-                                    <tarLongFileFormat>gnu</tarLongFileFormat>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>rename-source-release-assembly</id>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <executable>mv</executable>
-                                    <workingDirectory>${project.build.directory}</workingDirectory>
-                                    <commandlineArgs>-n nifi-${project.version}-source-release.tar.gz
nifi-${project.version}-src.tar.gz</commandlineArgs>
-                                    <successCodes>
-                                        <successCode>0</successCode>
-                                        <successCode>1</successCode>
-                                    </successCodes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <!-- Seal jars and skip tests when the
-            apache-release profile is activated. -->
-            <id>seal-jars</id>
-            <properties>
-                <sealJars>true</sealJars>
-                <skipTests>true</skipTests>
-            </properties>
-        </profile>
-        <profile>
             <!-- Automatically check for licenses.
             Activate with -P check-licenses -->
             <id>check-licenses</id>


Mime
View raw message