You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/12/18 14:05:30 UTC
[myfaces] branch master updated: better plugin config
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 9a8c8ee better plugin config
9a8c8ee is described below
commit 9a8c8eeff3046577812b48f84a1180a8f1461440
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Dec 18 15:05:23 2019 +0100
better plugin config
---
api/pom.xml | 17 ---
assembly/pom.xml | 445 +++++++++++++++++++++++++++----------------------------
impl/pom.xml | 13 +-
parent/pom.xml | 14 +-
pom.xml | 12 --
5 files changed, 238 insertions(+), 263 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index dd64e60..5bfef07 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -50,7 +50,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
<executions>
<execution>
<id>parse-version</id>
@@ -61,22 +60,6 @@
</executions>
</plugin>
-
- <!-- license checker needs to exclude some kinds of files -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- dojo has combined new bsd + AFL 2.1 license -->
- <exclude>src/main/resources/META-INF/licenses/dojo-LICENSE.TXT</exclude>
-
- <!-- facelets has non-standard APL license -->
- <exclude>src/main/resources/META-INF/licenses/facelets-LICENSE.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 495175d..caef2bf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -16,244 +16,243 @@
* limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>myfaces-core-assembly</artifactId>
- <packaging>pom</packaging>
- <name>Core Assembly</name>
- <description>
- This is the MyFaces Assembly [INSERT MORE STUFF HERE]
- </description>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>myfaces-core-assembly</artifactId>
+ <packaging>pom</packaging>
+ <name>Core Assembly</name>
+ <description>
+ This is the MyFaces Assembly [INSERT MORE STUFF HERE]
+ </description>
- <parent>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-core-project</artifactId>
- <version>2.3-next-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>2.3-next-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
- <build>
+ <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
- <executions>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
- <execution>
- <id>copy-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-tlddoc</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
+ <execution>
+ <id>copy-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-tlddoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>tlddoc</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>facelets-tlddoc</classifier>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>tlddoc</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>facelets-tlddoc</classifier>
+ </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-jsdoc</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- <classifier>jsdoc</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/jsdoc</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>copy-source</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-core-module</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- <classifier>source-release</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/src</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-jsdoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>jsdoc</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/jsdoc</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-source</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-module</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>source-release</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <!-- EXECUTE mvn package to generate assembly files -->
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make_assembly_src</id>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/coresrc.xml</descriptor>
- </descriptors>
- <finalName>myfaces-core-${project.version}-src</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- <execution>
- <id>make_assembly_bin</id>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
- </descriptors>
- <finalName>myfaces-core-${project.version}-bin</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <outputDirectory>target/assembly/out</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <!-- EXECUTE mvn package to generate assembly files -->
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make_assembly_src</id>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/coresrc.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${project.version}-src</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>make_assembly_bin</id>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/assembly/corebin.xml</descriptor>
+ </descriptors>
+ <finalName>myfaces-core-${project.version}-bin</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <outputDirectory>target/assembly/out</outputDirectory>
+ <workDirectory>target/assembly/work</workDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/assembly/out/myfaces-core-${project.version}-bin.zip</file>
- <type>zip</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
- <file>target/assembly/out/myfaces-core-${project.version}-bin.tar.gz</file>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
- <file>target/assembly/out/myfaces-core-${project.version}-src.zip</file>
- <type>zip</type>
- <classifier>src</classifier>
- </artifact>
- <artifact>
- <file>target/assembly/out/myfaces-core-${project.version}-src.tar.gz</file>
- <type>tar.gz</type>
- <classifier>src</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-bin.zip</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-bin.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-src.zip</file>
+ <type>zip</type>
+ <classifier>src</classifier>
+ </artifact>
+ <artifact>
+ <file>target/assembly/out/myfaces-core-${project.version}-src.tar.gz</file>
+ <type>tar.gz</type>
+ <classifier>src</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>1.0.6</version>
- <configuration>
- <id>myfaces-nightly-builds</id>
- <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
- <inputDirectory>target/assembly/out</inputDirectory>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0.6</version>
+ <configuration>
+ <id>myfaces-nightly-builds</id>
+ <url>scpexe://minotaur.apache.org/www/cvs.apache.org/builds/myfaces/nightly</url>
+ <inputDirectory>target/assembly/out</inputDirectory>
+ </configuration>
+ </plugin>
- </plugins>
+ </plugins>
- </build>
+ </build>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-bundle</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-bundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
diff --git a/impl/pom.xml b/impl/pom.xml
index 6e72551..56c9567 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -75,6 +75,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>src/main/resources/META-INF/licenses/*-LICENSE.txt</exclude>
+ <exclude>src/main/resources/META-INF/licenses/*-LICENSE.TXT</exclude>
+ <exclude>src/main/resources/META-INF/services/**</exclude>
<!-- The xsd files are CDDL+GLP:
Category B: Reciprocal Licenses
@@ -85,19 +88,9 @@
whose inclusion is mandated by the JSR 127: JavaServer Faces specification."
http://www.apache.org/legal/3party.html
-->
- <exclude>src/main/resources/META-INF/licenses/glassfish-LICENSE.txt</exclude>
<exclude>src/main/resources/org/apache/myfaces/resource/javaee_5.xsd</exclude>
<exclude>src/main/resources/org/apache/myfaces/resource/javaee_web_services_client_1_2.xsd</exclude>
- <!-- facelets has non-standard APL license -->
- <exclude>src/main/resources/META-INF/licenses/facelets-LICENSE.txt</exclude>
- <exclude>src/main/resources/META-INF/licenses/omnifaces-LICENSE.txt</exclude>
-
- <!-- services files are trivial config files with no comments -->
- <exclude>src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider</exclude>
- <exclude>src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension</exclude>
- <exclude>src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer</exclude>
-
<!-- This file probably needs a license, but I don't know if it's safe to put it in there -->
<exclude>src/test/resources/org/apache/myfaces/context/nestedScriptCDATA.xml</exclude>
<exclude>src/test/resources/META-INF/openwebbeans/openwebbeans.properties</exclude>
diff --git a/parent/pom.xml b/parent/pom.xml
index ad9a736..0f7ae6a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>1.9.1</version>
</plugin>
<plugin>
@@ -249,6 +249,18 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*/MANIFEST.MF</exclude>
+ <exclude>.git</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>target/**</exclude>
+ <exclude>src/main/resources/META-INF/licenses/*-LICENSE.txt</exclude>
+ <exclude>src/main/resources/META-INF/licenses/*-LICENSE.TXT</exclude>
+ <exclude>src/main/resources/META-INF/services/**</exclude>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </configuration>
<executions>
<execution>
<phase>verify</phase>
diff --git a/pom.xml b/pom.xml
index 2ea2c94..d3a2ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,18 +86,6 @@
</pluginManagement>
<plugins>
- <!-- license checker needs to exclude some kinds of files -->
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- This file is created during a release and needs no licensing text -->
- <exclude>DEPENDENCIES</exclude>
- </excludes>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>