You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2019/05/15 18:38:11 UTC
[incubator-tamaya] branch master updated (047dfac -> 7443559)
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git.
from 047dfac TAMAYA-277: Try to reapply changes after merge errors
new 9aa59c2 TAMAYA-387: Reapply updating Checkstyle
new 21131d4 TAMAYA-387: Reapply updating Checkstyle
new 7443559 TAMAYA-387: Update jacoco and reapply changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/checkstyle/style.xml | 5 +-
pom.xml | 65 +++++++++++++++++-----
2 files changed, 53 insertions(+), 17 deletions(-)
[incubator-tamaya] 01/03: TAMAYA-387: Reapply updating Checkstyle
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git
commit 9aa59c2524a02b8cbd3fe1567c22bbf2a5435be9
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Wed May 15 20:35:56 2019 +0200
TAMAYA-387: Reapply updating Checkstyle
---
buildconfigurations/src/main/resources/checkstyle/style.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/buildconfigurations/src/main/resources/checkstyle/style.xml b/buildconfigurations/src/main/resources/checkstyle/style.xml
index ec99292..bf9f310 100644
--- a/buildconfigurations/src/main/resources/checkstyle/style.xml
+++ b/buildconfigurations/src/main/resources/checkstyle/style.xml
@@ -26,8 +26,6 @@ under the License.
<property name="file" value="${checkstyle.suppressions.file}"/>
</module>
- <module name="SuppressionCommentFilter"/>
-
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="FileLength">
@@ -41,8 +39,7 @@ under the License.
<module name="TreeWalker">
- <!-- needed for the SuppressionCommentFilter -->
- <module name="FileContentsHolder"/>
+ <module name="SuppressionCommentFilter"/>
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
[incubator-tamaya] 02/03: TAMAYA-387: Reapply updating Checkstyle
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git
commit 21131d4f531740b4e50c0c0578de933515fec572
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Wed May 15 20:36:42 2019 +0200
TAMAYA-387: Reapply updating Checkstyle
---
pom.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 52 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49dfb7f..3bc8ee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<jruby.version>1.7.26</jruby.version>
<findbugs.version>3.0.4</findbugs.version>
<mockito.version>1.10.19</mockito.version>
- <rat.version>0.12</rat.version>
+ <rat.version>0.13</rat.version>
<toolchains.plugin>1.1</toolchains.plugin>
<assertj.version>3.10.0</assertj.version>
@@ -354,11 +354,6 @@
<version>${assembly.version}</version>
</plugin>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- </plugin>
- <plugin>
<groupId>org.pitest</groupId>
<artifactId>pitest-maven</artifactId>
<version>${pitest-plugin.version}</version>
@@ -407,13 +402,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>7.8</version>
- <exclusions><!-- MCHECKSTYLE-156 -->
- <exclusion>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
+ <version>8.19</version>
</dependency>
</dependencies>
</plugin>
@@ -648,6 +637,37 @@
</execution>
</executions>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.rat
+ </groupId>
+ <artifactId>
+ apache-rat-plugin
+ </artifactId>
+ <versionRange>
+ [0.12,)
+ </versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -668,6 +688,25 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>4.0.5</version>
[incubator-tamaya] 03/03: TAMAYA-387: Update jacoco and reapply
changes
Posted by po...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pottlinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tamaya.git
commit 74435599d1006d5d5ce8e4b0ec6e7b04fdb53502
Author: Hugo Hirsch <gi...@hugo-hirsch.de>
AuthorDate: Wed May 15 20:38:01 2019 +0200
TAMAYA-387: Update jacoco and reapply changes
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3bc8ee1..4fc61f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -690,7 +690,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
+ <version>0.8.4</version>
<executions>
<execution>
<goals>