You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2018/09/20 07:20:43 UTC
empire-db git commit: Revert maven plugin changes made for testing
Repository: empire-db
Updated Branches:
refs/heads/master fd3e96f90 -> 2ca089a20
Revert maven plugin changes made for testing
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/2ca089a2
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/2ca089a2
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/2ca089a2
Branch: refs/heads/master
Commit: 2ca089a20e7a90bdced26a3cb0b1194c277a99d4
Parents: fd3e96f
Author: Rainer Döbele <do...@apache.org>
Authored: Thu Sep 20 09:20:38 2018 +0200
Committer: Rainer Döbele <do...@apache.org>
Committed: Thu Sep 20 09:20:38 2018 +0200
----------------------------------------------------------------------
empire-db-jsf2/pom.xml | 3 +--
pom.xml | 29 ++++++++++-------------------
2 files changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/empire-db/blob/2ca089a2/empire-db-jsf2/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/pom.xml b/empire-db-jsf2/pom.xml
index 97d5653..0193bb6 100644
--- a/empire-db-jsf2/pom.xml
+++ b/empire-db-jsf2/pom.xml
@@ -71,7 +71,7 @@
<build>
<pluginManagement>
<plugins>
- <!-- allow java 6 api calls for this module
+ <!-- allow java 6 api calls for this module -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -83,7 +83,6 @@
</signature>
</configuration>
</plugin>
- -->
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/2ca089a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 65304c1..5d3be43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,16 +64,15 @@
<id>CI</id>
<build>
<plugins>
- <!-- check the apache headers
+ <!-- check the apache headers -->
<plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
<configuration>
- <! - TODO enable strict checking and fix issues - >
+ <!-- TODO enable strict checking and fix issues -->
<strictCheck>false</strictCheck>
</configuration>
</plugin>
- -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -99,7 +98,6 @@
</execution>
</executions>
</plugin>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -112,7 +110,6 @@
</execution>
</executions>
</plugin>
- -->
</plugins>
</build>
</profile>
@@ -397,12 +394,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
</plugin>
- <!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -480,15 +475,14 @@
</execution>
</executions>
</plugin>
- <!--
<plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>3.0</version>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.9.0</version>
<configuration>
<basedir>${basedir}</basedir>
<header>tools/header.txt</header>
- <! - <header>${basedir}/src/etc/header.txt</header> - >
+ <!--<header>${basedir}/src/etc/header.txt</header>-->
<quiet>false</quiet>
<failIfMissing>true</failIfMissing>
<aggregate>false</aggregate>
@@ -509,7 +503,6 @@
</execution>
</executions>
</plugin>
- -->
<!-- When enforcer enabled this will make sure we compile using java 1.6.x using maven 3.x -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -535,7 +528,7 @@
</execution>
</executions>
</plugin>
- <!-- check that all api calls are java5 compatible
+ <!-- check that all api calls are java5 compatible -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -557,7 +550,6 @@
</signature>
</configuration>
</plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -733,12 +725,11 @@
<artifactId>maven-jxr-plugin</artifactId>
<version>2.4</version>
</plugin>
- <!-- maven-javadoc-plugin
+ <!-- maven-javadoc-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
- -->
<!-- maven-changelog-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>