[med-svn] [Git][med-team/artemis][master] 2 commits: No need for jacoco, that's a test coverage tool that can be safely disabled...
Andreas Tille
gitlab at salsa.debian.org
Mon Jan 28 19:14:26 GMT 2019
Andreas Tille pushed to branch master at Debian Med / artemis
Commits:
ffa3f83b by Andreas Tille at 2019-01-28T15:35:47Z
No need for jacoco, that's a test coverage tool that can be safely disabled when building Debian packages.
- - - - -
edcab6c5 by Andreas Tille at 2019-01-28T19:13:58Z
Add missing Build-Depends
- - - - -
3 changed files:
- debian/control
- + debian/maven.ignoreRules
- debian/patches/maven_depencencies.patch
Changes:
=====================================
debian/control
=====================================
@@ -8,6 +8,14 @@ Build-Depends: debhelper (>= 12~),
javahelper,
maven-debian-helper,
libmaven-enforcer-plugin-java,
+ libmaven-install-plugin-java,
+ libproperties-maven-plugin-java,
+ libmaven-antrun-plugin-java,
+ libmaven-resources-plugin-java,
+ libbuild-helper-maven-plugin-java,
+ libmaven-jar-plugin-java,
+ libmaven-shade-plugin-java,
+ libmaven-assembly-plugin-java,
libbiojava-java,
libj2ssh-java,
libibatis-java,
@@ -18,7 +26,6 @@ Build-Depends: debhelper (>= 12~),
libcommons-net-java,
libcommons-lang3-java,
libbatik-java,
- libjacoco-java (>= 0.8.2),
jemboss,
# For tests
ant,
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,3 @@
+# see https://lists.debian.org/debian-java/2019/01/msg00063.html
+org.jacoco jacoco-maven-plugin
+org.apache.maven.plugins maven-enforcer-plugin
=====================================
debian/patches/maven_depencencies.patch
=====================================
@@ -8,11 +8,153 @@
<executions>
<execution>
<id>enforce-maven-3</id>
-@@ -621,7 +620,6 @@ Artemis is written in Java, and is avail
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
-- <version>0.8.2</version>
+@@ -499,7 +498,6 @@ Artemis is written in Java, and is avail
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+- <version>3.0.2</version>
+ <executions>
+ <!-- Copy etc on to classpath -->
+ <execution>
+@@ -554,7 +552,6 @@ Artemis is written in Java, and is avail
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+- <version>3.1.0</version>
<configuration>
- <skip>${skip.coverage.reporting}</skip>
+ <archive>
+ <manifest>
+@@ -616,55 +613,12 @@ Artemis is written in Java, and is avail
</configuration>
+ </plugin>
+
+- <!-- =================================== Run Jacoco coverage report ======================================-->
+-
+- <plugin>
+- <groupId>org.jacoco</groupId>
+- <artifactId>jacoco-maven-plugin</artifactId>
+- <version>0.8.2</version>
+- <configuration>
+- <skip>${skip.coverage.reporting}</skip>
+- </configuration>
+- <executions>
+- <execution>
+- <id>pre-unit-test</id>
+- <goals>
+- <goal>prepare-agent</goal>
+- </goals>
+- <configuration>
+- <output>file</output>
+- <!-- Sets the path to the file which contains the execution data. -->
+- <destFile>${project.build.directory}/jacoco-ut.exec</destFile>
+- <!-- Sets the name of the property containing the settings for JaCoCo
+- runtime agent. -->
+- <propertyName>surefireArgLine</propertyName>
+- </configuration>
+- </execution>
+- <!-- Ensures that the code coverage report for unit tests is created after
+- unit tests have been run. -->
+- <execution>
+- <id>post-unit-test</id>
+- <phase>test</phase>
+- <goals>
+- <goal>report</goal>
+- </goals>
+- <configuration>
+- <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
+- <outputDirectory>${project.build.directory}/coverage-report</outputDirectory>
+- <excludes>
+- <exclude>org/**</exclude>
+- </excludes>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+
+ <!-- ============= Package the code and dependent jars into one executable jar for each applications ========= -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+- <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>package-win-artemis-jar</id>
+@@ -1005,66 +959,12 @@ Artemis is written in Java, and is avail
+ </plugin>
+
+
+- <!-- ============================= Sign executable jar files ============================ -->
+-
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-jarsigner-plugin</artifactId>
+- <version>1.4</version>
+- <executions>
+- <execution>
+- <id>sign-win-jars</id>
+- <phase>package</phase>
+- <goals>
+- <goal>sign</goal>
+- </goals>
+- <configuration>
+- <skip>${jarsigner.skip}</skip>
+- <verbose>false</verbose>
+- <processMainArtifact>false</processMainArtifact>
+- <processAttachedArtifacts>false</processAttachedArtifacts>
+- <archiveDirectory>target/win-jars</archiveDirectory>
+- <keystore>${signer-keystore-path}</keystore>
+- <storetype>${signer-keystore-type}</storetype>
+- <alias>${signer-keystore-alias}</alias>
+- <storepass>${signer-keystore-password}</storepass>
+- <keypass>${signer-keystore-password}</keypass>
+- <removeExistingSignatures>true</removeExistingSignatures>
+- <tsa>http://timestamp.comodoca.com/rfc3161</tsa>
+- </configuration>
+- </execution>
+- <execution>
+- <id>sign-default-jars</id>
+- <phase>package</phase>
+- <goals>
+- <goal>sign</goal>
+- </goals>
+- <configuration>
+- <skip>${jarsigner.skip}</skip>
+- <verbose>false</verbose>
+- <processMainArtifact>false</processMainArtifact>
+- <processAttachedArtifacts>false</processAttachedArtifacts>
+- <archiveDirectory>target/jars</archiveDirectory>
+- <keystore>${signer-keystore-path}</keystore>
+- <storetype>${signer-keystore-type}</storetype>
+- <alias>${signer-keystore-alias}</alias>
+- <storepass>${signer-keystore-password}</storepass>
+- <keypass>${signer-keystore-password}</keypass>
+- <removeExistingSignatures>true</removeExistingSignatures>
+- <tsa>http://timestamp.comodoca.com/rfc3161</tsa>
+- </configuration>
+- </execution>
+- </executions>
+-
+- </plugin>
+-
+
+ <!-- ========================== Create release zips ============================ -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+- <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>create-unix-release</id>
+@@ -1350,10 +1250,6 @@ Artemis is written in Java, and is avail
+ <properties>
+ <skip.tests>false</skip.tests>
+ <evosuite.exclude.filter></evosuite.exclude.filter>
+- <jarsigner.skip>false</jarsigner.skip>
+- <skip.artifact.creation>false</skip.artifact.creation>
+- <skip.coverage.reporting>false</skip.coverage.reporting>
+- <skip.javadoc>false</skip.javadoc>
+
+ <build.profile.id>release</build.profile.id>
+ </properties>
View it on GitLab: https://salsa.debian.org/med-team/artemis/compare/70fe41bc9bfdf21d95f8301007abb58291d5ad95...edcab6c5dc8765627b10bd34f4e892dea2653511
--
View it on GitLab: https://salsa.debian.org/med-team/artemis/compare/70fe41bc9bfdf21d95f8301007abb58291d5ad95...edcab6c5dc8765627b10bd34f4e892dea2653511
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190128/dac7aecc/attachment-0001.html>
More information about the debian-med-commit
mailing list