You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/10 06:40:12 UTC
logging-chainsaw git commit: Disable macOS packaging step
Repository: logging-chainsaw
Updated Branches:
refs/heads/master 4c37b5d35 -> 112382683
Disable macOS packaging step
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/11238268
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/11238268
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/11238268
Branch: refs/heads/master
Commit: 1123826836323a94d73355f0f6d7fd39466ad657
Parents: 4c37b5d
Author: Matt Sicker <bo...@gmail.com>
Authored: Sat Mar 10 00:40:07 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Sat Mar 10 00:40:07 2018 -0600
----------------------------------------------------------------------
Jenkinsfile | 2 +-
pom.xml | 47 ++++++++++++++++++++++++-----------------------
2 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/11238268/Jenkinsfile
----------------------------------------------------------------------
diff --git a/Jenkinsfile b/Jenkinsfile
index cb8231b..81af245 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
}
}
junit '**/target/surefire-reports/*.xml'
- archiveArtifacts 'target/apache-chainsaw-*.*'
+ archiveArtifacts '**/target/apache-chainsaw-*.*'
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/11238268/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab1c6d6..178916c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,29 +339,30 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>sh.tak.appbundler</groupId>
- <artifactId>appbundle-maven-plugin</artifactId>
- <version>1.2.0</version>
- <configuration>
- <mainClass>${chainsaw.mainclass}</mainClass>
- <bundleName>Chainsaw</bundleName>
- <iconFile>logo.icns</iconFile>
- <generateDiskImageFile>true</generateDiskImageFile>
- <jvmOptions>
- <jvmOption>-Xms128m</jvmOption>
- <jvmOption>-Xmx512m</jvmOption>
- </jvmOptions>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!-- FIXME: make this plugin optional -->
+ <!--<plugin>-->
+ <!--<groupId>sh.tak.appbundler</groupId>-->
+ <!--<artifactId>appbundle-maven-plugin</artifactId>-->
+ <!--<version>1.2.0</version>-->
+ <!--<configuration>-->
+ <!--<mainClass>${chainsaw.mainclass}</mainClass>-->
+ <!--<bundleName>Chainsaw</bundleName>-->
+ <!--<iconFile>logo.icns</iconFile>-->
+ <!--<generateDiskImageFile>true</generateDiskImageFile>-->
+ <!--<jvmOptions>-->
+ <!--<jvmOption>-Xms128m</jvmOption>-->
+ <!--<jvmOption>-Xmx512m</jvmOption>-->
+ <!--</jvmOptions>-->
+ <!--</configuration>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<phase>package</phase>-->
+ <!--<goals>-->
+ <!--<goal>bundle</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>