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 2021/01/20 11:05:56 UTC
[myfaces] branch 2.3-next updated: added ci build to 2.3-next more
relaxed about Readme and *.iml files during rat check
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 2.3-next
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/2.3-next by this push:
new 86e6cd2 added ci build to 2.3-next more relaxed about Readme and *.iml files during rat check
new 943c31b Merge pull request #156 from bohmber/2.3-next-ci-improvements
86e6cd2 is described below
commit 86e6cd2c3dabb08ba98fb1fc63e5b4c233f493c2
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Wed Jan 20 11:59:06 2021 +0100
added ci build to 2.3-next
more relaxed about Readme and *.iml files during rat check
---
.github/workflows/myfaces-ci.yml | 69 ++++++
pom.xml | 441 ++++++++++++++++++++-------------------
2 files changed, 296 insertions(+), 214 deletions(-)
diff --git a/.github/workflows/myfaces-ci.yml b/.github/workflows/myfaces-ci.yml
new file mode 100644
index 0000000..043d8fd
--- /dev/null
+++ b/.github/workflows/myfaces-ci.yml
@@ -0,0 +1,69 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# NOTE https://infra.apache.org/github-actions-secrets.html
+
+name: MyFaces CI
+
+on:
+ push:
+ branches:
+ - master
+ - 3.0.x
+ - 2.3-next
+ - 2.3.x
+ pull_request:
+ branches:
+ - master
+ - 3.0.x
+ - 2.3-next
+ - 2.3.x
+ workflow_dispatch:
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Cache Maven packages
+ uses: actions/cache@v2
+ with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+ - name: Build with Maven
+ run: |
+ if ! mvn -B clean checkstyle:check org.apache.rat:apache-rat-plugin:check verify -Dformats=XML -f pom.xml; then
+ find . \( -path '*/target/surefire-reports/*.xml' -o -path '*/target/failsafe-reports/*.xml' -o -path '*/target/rat.txt' -o -path '*/target/checkstyle-result.xml' -o -path '*/target/dependency-check-report.xml' \) | zip -q reports.zip -@
+ exit 1
+ fi
+
+ - name: Reports
+ uses: actions/upload-artifact@v2
+ if: failure()
+ with:
+ name: reports
+ retention-days: 14
+ path: reports.zip
+ if-no-files-found: ignore
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 136e502..b7e90d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,215 +1,228 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * 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">
-
- <parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>19</version>
- <relativePath />
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-core-module</artifactId>
- <packaging>pom</packaging>
- <name>Apache MyFaces Core 2.3-next</name>
- <description>
- This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
- consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
- </description>
- <version>2.3-next-SNAPSHOT</version>
- <url>http://myfaces.apache.org/core23next</url>
-
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/MYFACES</url>
- </issueManagement>
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/myfaces.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/myfaces.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=myfaces.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <modules>
- <module>parent</module>
- <module>api</module>
- <module>test</module>
- <module>impl</module>
- <module>bundle</module>
- <!--
- <module>integration-tests</module>
- -->
- <module>extensions</module>
- </modules>
-
- <build>
-
- <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-7</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version>
- <configuration>
- <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
- <tryUpdate>true</tryUpdate>
- <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
- <content>\${siteContent.path}</content>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
- <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
-
- <!-- TODO jakobk: we could change this to -Papache-release -->
- <!--
- This profile is invoked by -DprepareRelease=true.
- This allows mvn release:prepare to run successfully on the assembly projects.
- -->
- <profile>
- <id>prepare-release</id>
- <activation>
- <property>
- <name>prepareRelease</name>
- </property>
- </activation>
- <modules>
- <module>assembly</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-DprepareRelease</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>perform-release</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <modules>
- <module>assembly</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-Papache-release -DperformRelease</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots.plugin</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
- <repositories>
-
- </repositories>
-
- <!--
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Apache Website</name>
- <url>scpexe://people.apache.org/www/myfaces.apache.org/core20/module</url>
- </site>
- </distributionManagement>
- -->
- <!-- To deploy the site, use site:stage-deploy goal and commit changes manually on
- https://svn.apache.org/repos/asf/myfaces/site/publish/
-
- -->
- <distributionManagement>
- <site>
- <id>myfaces-local-staging</id>
- <name>Apache Website</name>
- <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
- </site>
- </distributionManagement>
-
- <properties>
- <siteModule.path>core23next/module</siteModule.path>
- <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
- <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
- <!-- it's a default location for performance reason (not checkout the content all the time)
- you can override this value in your settings. -->
- <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
- <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
- <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
- </properties>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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">
+
+ <parent>
+ <groupId>org.apache.myfaces</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>19</version>
+ <relativePath />
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-module</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache MyFaces Core 2.3-next</name>
+ <description>
+ This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
+ consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
+ </description>
+ <version>2.3-next-SNAPSHOT</version>
+ <url>http://myfaces.apache.org/core23next</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/MYFACES</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/myfaces.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/myfaces.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=myfaces.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <modules>
+ <module>parent</module>
+ <module>api</module>
+ <module>test</module>
+ <module>impl</module>
+ <module>bundle</module>
+ <!--
+ <module>integration-tests</module>
+ -->
+ <module>extensions</module>
+ </modules>
+
+ <build>
+
+ <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-7</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <configuration>
+ <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+ <tryUpdate>true</tryUpdate>
+ <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+ <content>\${siteContent.path}</content>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/README.md</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/*.iml</exclude>
+ <!-- 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-site-plugin</artifactId>
+ <configuration>
+ <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+ <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+
+ <!-- TODO jakobk: we could change this to -Papache-release -->
+ <!--
+ This profile is invoked by -DprepareRelease=true.
+ This allows mvn release:prepare to run successfully on the assembly projects.
+ -->
+ <profile>
+ <id>prepare-release</id>
+ <activation>
+ <property>
+ <name>prepareRelease</name>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>perform-release</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <modules>
+ <module>assembly</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots.plugin</id>
+ <name>Apache Snapshot Repository</name>
+ <url>https://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+
+ </repositories>
+
+ <!--
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Website</name>
+ <url>scpexe://people.apache.org/www/myfaces.apache.org/core20/module</url>
+ </site>
+ </distributionManagement>
+ -->
+ <!-- To deploy the site, use site:stage-deploy goal and commit changes manually on
+ https://svn.apache.org/repos/asf/myfaces/site/publish/
+
+ -->
+ <distributionManagement>
+ <site>
+ <id>myfaces-local-staging</id>
+ <name>Apache Website</name>
+ <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <siteModule.path>core23next/module</siteModule.path>
+ <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+ <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+ <!-- it's a default location for performance reason (not checkout the content all the time)
+ you can override this value in your settings. -->
+ <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+ <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+ <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
+ </properties>
+
</project>
\ No newline at end of file