You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2017/02/07 10:42:55 UTC
[1/2] nifi git commit: NIFI-3434 - Introduce the ability to skip the
packaging of zip and tar.gz archive via maven profile (i.e. -Pdir-only)
Repository: nifi
Updated Branches:
refs/heads/master 9a638cc86 -> 839dd5ac1
NIFI-3434 - Introduce the ability to skip the packaging of zip and tar.gz archive
via maven profile (i.e. -Pdir-only)
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/68c2d786
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/68c2d786
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/68c2d786
Branch: refs/heads/master
Commit: 68c2d7862fd14367626227b341f78cbf36dfdff1
Parents: 9a638cc
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Fri Feb 3 22:51:55 2017 +1100
Committer: Pierre Villard <pi...@gmail.com>
Committed: Tue Feb 7 11:42:03 2017 +0100
----------------------------------------------------------------------
nifi-assembly/pom.xml | 64 ++++++++++++++++++++
.../src/main/assembly/dependencies.xml | 5 --
2 files changed, 64 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/68c2d786/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index ca5497c..177d77c 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -704,6 +704,70 @@ language governing permissions and limitations under the License. -->
</dependencies>
</profile>
<profile>
+ <id>generateArchives</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>nifi-${project.version}</finalName>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make shared resource</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>dir-only</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>nifi-${project.version}</finalName>
+ <attach>false</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make shared resource</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <formats>
+ <format>dir</format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>build-info-no-git</id>
<activation>
<activeByDefault>false</activeByDefault>
http://git-wip-us.apache.org/repos/asf/nifi/blob/68c2d786/nifi-assembly/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/src/main/assembly/dependencies.xml b/nifi-assembly/src/main/assembly/dependencies.xml
index 792353d..d8c5964 100644
--- a/nifi-assembly/src/main/assembly/dependencies.xml
+++ b/nifi-assembly/src/main/assembly/dependencies.xml
@@ -15,11 +15,6 @@
-->
<assembly>
<id>bin</id>
- <formats>
- <format>dir</format>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>nifi-${project.version}</baseDirectory>
[2/2] nifi git commit: NIFI-3434 - Modify travis to use new profile
as suggested during peer review
Posted by pv...@apache.org.
NIFI-3434 - Modify travis to use new profile as suggested during peer review
This closes #1472.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/839dd5ac
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/839dd5ac
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/839dd5ac
Branch: refs/heads/master
Commit: 839dd5ac182b300e9b3ea261a3a9bb29c0df12d2
Parents: 68c2d78
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Tue Feb 7 09:04:00 2017 +1100
Committer: Pierre Villard <pi...@gmail.com>
Committed: Tue Feb 7 11:42:15 2017 +0100
----------------------------------------------------------------------
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/839dd5ac/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ef8c350..9399fd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
- mvn apache-rat:check
install:
- - mvn -q -T 2C -DskipTests=true clean install
+ - mvn -q -T 2C -DskipTests=true -Pdir-only clean install
script:
- mvn -Pcontrib-check verify