You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2021/01/14 20:23:00 UTC
[myfaces] branch master updated: ci build fixes
This is an automated email from the ASF dual-hosted git repository.
bommel 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 7795206 ci build fixes
new 0d3ca57 Merge pull request #141 from bohmber/ci-build-fixes
7795206 is described below
commit 7795206ceb78ff11331e75134adbab3d09dc9206
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Thu Jan 14 19:26:18 2021 +0100
ci build fixes
---
.github/workflows/myfaces-ci.yml | 2 +-
api/pom.xml | 1146 ++++++++++----------
extensions/quarkus/pom.xml | 23 -
.../apache/myfaces/config/jsf22-faces-config.xml | 17 +
.../apache/myfaces/config/jsf23-faces-config.xml | 17 +
.../apache/myfaces/config/jsf30-faces-config.xml | 17 +
.../apache/myfaces/config/jsf40-faces-config.xml | 17 +
impl/standard-faces-config-base.NavData | 6 -
parent/pom.xml | 1069 +++++++++---------
pom.xml | 470 ++++----
10 files changed, 1428 insertions(+), 1356 deletions(-)
diff --git a/.github/workflows/myfaces-ci.yml b/.github/workflows/myfaces-ci.yml
index 668294b..8e5f9c0 100644
--- a/.github/workflows/myfaces-ci.yml
+++ b/.github/workflows/myfaces-ci.yml
@@ -44,7 +44,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: |
- if ! mvn -B clean verify -DprepareRelease=true -Dformats=XML -f pom.xml; then
+ if ! mvn -B clean 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
diff --git a/api/pom.xml b/api/pom.xml
index 6d65938..ba8ba95 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,586 +1,560 @@
-<?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.core</groupId>
- <artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <name>Apache MyFaces Core 4.0 - API</name>
- <description>
- The public API classes of the Apache MyFaces Core JSF-4.0 project
- </description>
- <url>https://myfaces.apache.org/#/core40</url>
-
- <build>
- <resources>
- <!-- standard resources -->
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <excludes>jakarta/faces/component/**/*.java</excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*/README.md</exclude>
- <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>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- compilation and compression of our javascripts -->
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-javascript-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
- <descriptor>${basedir}/src/assembler/jsfscripts-compiler.xml</descriptor>
- <excludes>
- <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
- </excludes>
- </configuration>
- </execution>
-
- <execution>
- <id>compile-uncompressed-full</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
- <descriptor>${basedir}/src/assembler/jsfscripts-uncompressed-full-compiler.xml</descriptor>
- <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
- <excludes>
- <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
- </excludes>
- </configuration>
- </execution>
-
- <execution>
- <id>compile-minimal</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
- <descriptor>${basedir}/src/assembler/jsfscripts-minimal-compiler.xml</descriptor>
- <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
- <excludes>
- <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
- </excludes>
- </configuration>
- </execution>
-
- <execution>
- <id>compile-i18n</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
- <descriptor>${basedir}/src/assembler/jsfscripts-i18n-compiler.xml</descriptor>
- <outputDirectory>${basedir}/target/classes/META-INF/resources/myfaces/</outputDirectory>
- <excludes>
- <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
- </excludes>
- </configuration>
- </execution>
-
- <execution>
- <id>compress</id>
- <goals>
- <goal>compress</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <scripts>target/classes/META-INF/resources/jakarta.faces/</scripts>
- <excludes>
- <exclude>jsf-uncompressed.js</exclude>
- <exclude>jsf-uncompressed-full.js</exclude>
- </excludes>
- <compressor>yahooUI</compressor>
- </configuration>
- </execution>
-
- <execution>
- <id>compress-extended</id>
- <goals>
- <goal>compress</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <scripts>target/classes/META-INF/resources/myfaces/</scripts>
- <excludes>
- <exclude>jsf-uncompressed.js</exclude>
- <exclude>jsf-uncompressed-full.js</exclude>
- </excludes>
- <compressor>yahooUI</compressor>
- </configuration>
- </execution>
-
- <execution>
- <id>compress-alternatives</id>
- <goals>
- <goal>compress</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <scripts>target/classes/META-INF/internal-resources/jakarta.faces/</scripts>
- <excludes>
- <exclude>jsf-uncompressed-full.js</exclude>
- <exclude>META-INF/**/*.js</exclude>
- </excludes>
- <compressor>yahooUI</compressor>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <optimizationLevel>0</optimizationLevel>
- <sourceDirectory>src/main/javascript</sourceDirectory>
- <webappDirectory>${basedir}</webappDirectory>
- <outputDirectory>${basedir}/target/classes/META-INF/resources/jakarta.faces/</outputDirectory>
- </configuration>
- </plugin>
-
-
- <!-- we want to use the test cases also in myfacse-impl, thus creating a test-jar -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <excludes>
- <exclude>**/META-INF/resources/myfaces/myfaces/**</exclude>
- <exclude>**/META-INF/resources/jakarta.faces/myfaces/**</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!--
- berlios jsunit under apache2 license to cover javascript core routines which
- do not have to rely on a browser or can work on browser mockups!
-
- for furhter on dom testing we probably have to integrate html based tests
- with a browser engine but for the core apis this should be sufficient
- -->
- <plugin>
- <groupId>de.berlios.jsunit</groupId>
- <artifactId>jsunit-maven2-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <!-- TODO currently deactivated -->
- <!--execution>
- <id>test</id>
- <goals>
- <goal>jsunit-test</goal>
- </goals>
- </execution-->
- </executions>
- <configuration>
- <sourceDirectory>src/main/javascript/META-INF/resources</sourceDirectory>
- <sources>
- <source>../../../../test/javascript/org/apache/myfaces/mockups/BrowserMockups.js</source>
- <!--
- <source>jakarta/faces/_util/OpenAjax.js</source>
- -->
- <source>jakarta/faces/_util/_JSF2Utils.js</source>
- <source>jakarta/faces/ajax/Ajax.js</source>
- <source>../../../../test/javascript/org/apache/myfaces/test/_TestScenario.js</source>
- </sources>
- <testSourceDirectory>src/test/javascript/org/apache/myfaces</testSourceDirectory>
- <reportsDirectory>target/surefire-reports</reportsDirectory>
- <testSuites>
- <testSuite>
- <name>jakarta.faces.Ajax</name>
- <type>TESTSUITES</type>
- <includes>
- <include>test/MockupTest.js</include>
- <include>utils/_JSF2UtilsTests.js</include>
- <include>ajax/AjaxTests.js</include>
- </includes>
- </testSuite>
- </testSuites>
- </configuration>
- </plugin>
-
- <!-- myfaces-builder-plugin for metadata and component classes -->
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>build-metadata</goal>
- </goals>
- </execution>
- <execution>
- <id>makecomp</id>
- <configuration>
- <jsfVersion>20</jsfVersion>
- <templateComponentName>componentClass20.vm</templateComponentName>
- </configuration>
- <goals>
- <goal>make-components</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- create manifest.mf for OSGi -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.myfaces.core.api</Bundle-SymbolicName>
- <Bundle-Classpath>.</Bundle-Classpath>
- <Build-Jdk>${java.version}</Build-Jdk>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
- <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
- <Export-Package>
- *;version="${project.version}"
- </Export-Package>
- <Import-Package>
- javax.el;version="[1.0.0, 3.1.0)",
- javax.validation*;version="[1.0.0, 2.0.0)",
- javax.servlet;version="[3, 5)",
- javax.servlet.http;version="[3, 5)",
- jakarta.faces.*;version="${project.version}"
- </Import-Package>
- <Require-Bundle>
- org.apache.myfaces.core.impl;bundle-version="${parsedVersion.osgiVersion}"
- </Require-Bundle>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- execute tests (JUnit) -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
-
- </build>
-
-
- <profiles>
-
- <!-- TODO jakobk: we could change this to -Papache-release -->
- <!--
- - Generate files that are good to have when doing a release to main
- - repositories, but which are not wanted when doing a quick
- - "mvn install" before testing some code modifications.
- -->
- <profile>
- <id>generate-assembly</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-jsdoc-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>attach-jsdoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- This profile verifies the binary compablity with the jsf api of the RI -->
- <profile>
- <id>checkCompatibility</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <comparisonArtifacts>
- <comparisonArtifact>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.faces</artifactId>
- <version>2.3.0</version>
- </comparisonArtifact>
- </comparisonArtifacts>
- <includes>
- <include>jakarta/faces/**</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>test</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- check for Java 1.6 -->
- <profile>
- <id>checkJDK</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- </plugins>
- </build>
- </profile>
-
- <!--
- this optional profile generates the jsdoc content from
- the embedded javascripts
- -->
-
- <profile>
- <id>generateJsDoc</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-jsdoc-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>jsdoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-
- <dependencies>
- <!-- Java EE APIs -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-websocket-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet.jsp.jstl</groupId>
- <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <classifier>jakarta</classifier>
- </dependency>
-
-
- <!-- builder-annotations like @JSFWebConfigParam -->
- <dependency>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>de.berlios.jsunit</groupId>
- <artifactId>jsunit-maven2-plugin</artifactId>
- </dependency>
- </dependencies>
-
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <tags>
- <tag>
- <name>JSFJspTag</name>
- <placement>X</placement>
- </tag>
- <tag>
- <name>JSFJspAttribute</name>
- <placement>X</placement>
- </tag>
- </tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-jsdoc-plugin</artifactId>
- <version>1.0-beta-1</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
+<?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.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <name>Apache MyFaces Core 4.0 - API</name>
+ <description>
+ The public API classes of the Apache MyFaces Core JSF-4.0 project
+ </description>
+ <url>https://myfaces.apache.org/#/core40</url>
+
+ <build>
+ <resources>
+ <!-- standard resources -->
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <excludes>jakarta/faces/component/**/*.java</excludes>
+ </configuration>
+ </plugin>
+
+ <!-- compilation and compression of our javascripts -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-javascript-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
+ <descriptor>${basedir}/src/assembler/jsfscripts-compiler.xml</descriptor>
+ <excludes>
+ <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compile-uncompressed-full</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
+ <descriptor>${basedir}/src/assembler/jsfscripts-uncompressed-full-compiler.xml</descriptor>
+ <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
+ <excludes>
+ <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compile-minimal</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
+ <descriptor>${basedir}/src/assembler/jsfscripts-minimal-compiler.xml</descriptor>
+ <outputDirectory>${basedir}/target/classes/META-INF/internal-resources/jakarta.faces/</outputDirectory>
+ <excludes>
+ <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compile-i18n</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/javascript/META-INF/resources</sourceDirectory>
+ <descriptor>${basedir}/src/assembler/jsfscripts-i18n-compiler.xml</descriptor>
+ <outputDirectory>${basedir}/target/classes/META-INF/resources/myfaces/</outputDirectory>
+ <excludes>
+ <exclude>**/myfaces/_impl/core/jsf-uncompressed.js</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compress</id>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <scripts>target/classes/META-INF/resources/jakarta.faces/</scripts>
+ <excludes>
+ <exclude>jsf-uncompressed.js</exclude>
+ <exclude>jsf-uncompressed-full.js</exclude>
+ </excludes>
+ <compressor>yahooUI</compressor>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compress-extended</id>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <scripts>target/classes/META-INF/resources/myfaces/</scripts>
+ <excludes>
+ <exclude>jsf-uncompressed.js</exclude>
+ <exclude>jsf-uncompressed-full.js</exclude>
+ </excludes>
+ <compressor>yahooUI</compressor>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>compress-alternatives</id>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <scripts>target/classes/META-INF/internal-resources/jakarta.faces/</scripts>
+ <excludes>
+ <exclude>jsf-uncompressed-full.js</exclude>
+ <exclude>META-INF/**/*.js</exclude>
+ </excludes>
+ <compressor>yahooUI</compressor>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <optimizationLevel>0</optimizationLevel>
+ <sourceDirectory>src/main/javascript</sourceDirectory>
+ <webappDirectory>${basedir}</webappDirectory>
+ <outputDirectory>${basedir}/target/classes/META-INF/resources/jakarta.faces/</outputDirectory>
+ </configuration>
+ </plugin>
+
+
+ <!-- we want to use the test cases also in myfacse-impl, thus creating a test-jar -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <excludes>
+ <exclude>**/META-INF/resources/myfaces/myfaces/**</exclude>
+ <exclude>**/META-INF/resources/jakarta.faces/myfaces/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!--
+ berlios jsunit under apache2 license to cover javascript core routines which
+ do not have to rely on a browser or can work on browser mockups!
+
+ for furhter on dom testing we probably have to integrate html based tests
+ with a browser engine but for the core apis this should be sufficient
+ -->
+ <plugin>
+ <groupId>de.berlios.jsunit</groupId>
+ <artifactId>jsunit-maven2-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <!-- TODO currently deactivated -->
+ <!--execution>
+ <id>test</id>
+ <goals>
+ <goal>jsunit-test</goal>
+ </goals>
+ </execution-->
+ </executions>
+ <configuration>
+ <sourceDirectory>src/main/javascript/META-INF/resources</sourceDirectory>
+ <sources>
+ <source>../../../../test/javascript/org/apache/myfaces/mockups/BrowserMockups.js</source>
+ <!--
+ <source>jakarta/faces/_util/OpenAjax.js</source>
+ -->
+ <source>jakarta/faces/_util/_JSF2Utils.js</source>
+ <source>jakarta/faces/ajax/Ajax.js</source>
+ <source>../../../../test/javascript/org/apache/myfaces/test/_TestScenario.js</source>
+ </sources>
+ <testSourceDirectory>src/test/javascript/org/apache/myfaces</testSourceDirectory>
+ <reportsDirectory>target/surefire-reports</reportsDirectory>
+ <testSuites>
+ <testSuite>
+ <name>jakarta.faces.Ajax</name>
+ <type>TESTSUITES</type>
+ <includes>
+ <include>test/MockupTest.js</include>
+ <include>utils/_JSF2UtilsTests.js</include>
+ <include>ajax/AjaxTests.js</include>
+ </includes>
+ </testSuite>
+ </testSuites>
+ </configuration>
+ </plugin>
+
+ <!-- myfaces-builder-plugin for metadata and component classes -->
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>makecomp</id>
+ <configuration>
+ <jsfVersion>20</jsfVersion>
+ <templateComponentName>componentClass20.vm</templateComponentName>
+ </configuration>
+ <goals>
+ <goal>make-components</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- create manifest.mf for OSGi -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.myfaces.core.api</Bundle-SymbolicName>
+ <Bundle-Classpath>.</Bundle-Classpath>
+ <Build-Jdk>${java.version}</Build-Jdk>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+ <Export-Package>
+ *;version="${project.version}"
+ </Export-Package>
+ <Import-Package>
+ javax.el;version="[1.0.0, 3.1.0)",
+ javax.validation*;version="[1.0.0, 2.0.0)",
+ javax.servlet;version="[3, 5)",
+ javax.servlet.http;version="[3, 5)",
+ jakarta.faces.*;version="${project.version}"
+ </Import-Package>
+ <Require-Bundle>
+ org.apache.myfaces.core.impl;bundle-version="${parsedVersion.osgiVersion}"
+ </Require-Bundle>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- execute tests (JUnit) -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+
+ </build>
+
+
+ <profiles>
+
+ <!-- TODO jakobk: we could change this to -Papache-release -->
+ <!--
+ - Generate files that are good to have when doing a release to main
+ - repositories, but which are not wanted when doing a quick
+ - "mvn install" before testing some code modifications.
+ -->
+ <profile>
+ <id>generate-assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-jsdoc-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>attach-jsdoc</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- This profile verifies the binary compablity with the jsf api of the RI -->
+ <profile>
+ <id>checkCompatibility</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.faces</artifactId>
+ <version>2.3.0</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <includes>
+ <include>jakarta/faces/**</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- check for Java 1.6 -->
+ <profile>
+ <id>checkJDK</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ this optional profile generates the jsdoc content from
+ the embedded javascripts
+ -->
+
+ <profile>
+ <id>generateJsDoc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-jsdoc-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>jsdoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+
+ <dependencies>
+ <!-- Java EE APIs -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <classifier>jakarta</classifier>
+ </dependency>
+
+
+ <!-- builder-annotations like @JSFWebConfigParam -->
+ <dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>de.berlios.jsunit</groupId>
+ <artifactId>jsunit-maven2-plugin</artifactId>
+ </dependency>
+ </dependencies>
+
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <tags>
+ <tag>
+ <name>JSFJspTag</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>JSFJspAttribute</name>
+ <placement>X</placement>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-jsdoc-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>dual-report</id>
+ <configuration>
+ <type>range</type>
+ <range>30</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
diff --git a/extensions/quarkus/pom.xml b/extensions/quarkus/pom.xml
index 41e7b71..ce788f3 100644
--- a/extensions/quarkus/pom.xml
+++ b/extensions/quarkus/pom.xml
@@ -56,29 +56,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*/README.md</exclude>
- <exclude>**/*/MANIFEST.MF</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>.git</exclude>
- <exclude>.gitignore</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>src/main/resources/META-INF/services/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/impl/src/test/resources/org/apache/myfaces/config/jsf22-faces-config.xml b/impl/src/test/resources/org/apache/myfaces/config/jsf22-faces-config.xml
index 9cb45c5..23279cc 100644
--- a/impl/src/test/resources/org/apache/myfaces/config/jsf22-faces-config.xml
+++ b/impl/src/test/resources/org/apache/myfaces/config/jsf22-faces-config.xml
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
<faces-config
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/impl/src/test/resources/org/apache/myfaces/config/jsf23-faces-config.xml b/impl/src/test/resources/org/apache/myfaces/config/jsf23-faces-config.xml
index 5008f71..2fa75e8 100644
--- a/impl/src/test/resources/org/apache/myfaces/config/jsf23-faces-config.xml
+++ b/impl/src/test/resources/org/apache/myfaces/config/jsf23-faces-config.xml
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
<faces-config
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/impl/src/test/resources/org/apache/myfaces/config/jsf30-faces-config.xml b/impl/src/test/resources/org/apache/myfaces/config/jsf30-faces-config.xml
index 6733d6b..eaf1405 100644
--- a/impl/src/test/resources/org/apache/myfaces/config/jsf30-faces-config.xml
+++ b/impl/src/test/resources/org/apache/myfaces/config/jsf30-faces-config.xml
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/impl/src/test/resources/org/apache/myfaces/config/jsf40-faces-config.xml b/impl/src/test/resources/org/apache/myfaces/config/jsf40-faces-config.xml
index 4c6afd1..790592b 100644
--- a/impl/src/test/resources/org/apache/myfaces/config/jsf40-faces-config.xml
+++ b/impl/src/test/resources/org/apache/myfaces/config/jsf40-faces-config.xml
@@ -1,3 +1,20 @@
+<!--
+ 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.
+-->
+
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/impl/standard-faces-config-base.NavData b/impl/standard-faces-config-base.NavData
deleted file mode 100644
index 187ec92..0000000
--- a/impl/standard-faces-config-base.NavData
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scene Scope="Project" version="2">
- <Scope Scope="Faces Configuration Only"/>
- <Scope Scope="Project"/>
- <Scope Scope="All Faces Configurations"/>
-</Scene>
diff --git a/parent/pom.xml b/parent/pom.xml
index 46e7843..1004dec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,526 +1,543 @@
-<?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 imcommons-digesterplied.
- * 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-project</artifactId>
- <packaging>pom</packaging>
- <name>Apache MyFaces Core 4.0 - Parent</name>
- <description>
- This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
- consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
- </description>
- <version>4.0.0-SNAPSHOT</version>
- <url>https://myfaces.apache.org/#/core40</url>
-
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/MYFACES</url>
- </issueManagement>
-
- <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>
-
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configLocation>default/myfaces-checks-standard.xml</configLocation>
- <headerLocation>default/myfaces-header.txt</headerLocation>
- </configuration>
- </plugin>
-
- <!-- attach -sources.jar to all our modules -->
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <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>
-
- <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.myfaces.buildtools</groupId>
- <artifactId>myfaces-faces-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.11</version>
- </plugin>
-
- <plugin>
- <artifactId>myfaces-javascript-plugin</artifactId>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <version>1.0.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
- </plugin>
-
- <!-- SITE GENERATION -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <source>8</source>
- <additionalJOption>-Xdoclint:none</additionalJOption>
- <tags>
- <tag>
- <name>JSFJspTag</name>
- <placement>X</placement>
- </tag>
- <tag>
- <name>JSFJspAttribute</name>
- <placement>X</placement>
- </tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.12.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </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>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-DprepareRelease</arguments>
- </configuration>
- </plugin>
- <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>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>perform-release</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <arguments>-Papache-release -DperformRelease</arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <source>8</source>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>3.12.0</version>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/java/basic.xml</ruleset>
- <ruleset>/rulesets/java/unusedcode.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.8</targetJdk>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>pmd</report>
- <report>cpd</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- </plugin>
- </plugins>
- </reporting>
-
-
- <dependencyManagement>
- <dependencies>
- <!-- Java EE APIs -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>10.0.0-M9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-websocket-api</artifactId>
- <version>10.0.0-M9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>10.0.0-M9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet.jsp.jstl</groupId>
- <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>2.0.0-RC1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.servlet.jsp</groupId>
- <artifactId>jakarta.servlet.jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.el</groupId>
- <artifactId>jakarta.el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- <version>1.3</version>
- <scope>provided</scope>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>3.0.0-M1</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>3.0.0-RC2</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jakarta.ejb</groupId>
- <artifactId>jakarta.ejb-api</artifactId>
- <version>4.0.0-RC2</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_2.0_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- <classifier>jakarta</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- <classifier>jakarta</classifier>
- </dependency>
-
-
- <!-- UTILITY DEPENDENCIES -->
-
- <!-- builder-annotations like @JSFWebConfigParam -->
- <dependency>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-builder-annotations</artifactId>
- <version>1.0.9</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- tomcat 7 support (InjectionProvider) -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>9.0.14</version>
- <scope>provided</scope>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <!-- easymock -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>de.berlios.jsunit</groupId>
- <artifactId>jsunit-maven2-plugin</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
-
- <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>
-
- <!--
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Apache Website</name>
- <url>scpexe://people.apache.org/www/myfaces.apache.org/core21/</url>
- </site>
- </distributionManagement>-->
- <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>core40</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>
+<?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 imcommons-digesterplied.
+ * 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-project</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache MyFaces Core 4.0 - Parent</name>
+ <description>
+ This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
+ consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
+ </description>
+ <version>4.0.0-SNAPSHOT</version>
+ <url>https://myfaces.apache.org/#/core40</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/MYFACES</url>
+ </issueManagement>
+
+ <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>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.6.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configLocation>default/myfaces-checks-standard.xml</configLocation>
+ <headerLocation>default/myfaces-header.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/README.md</exclude>
+ <exclude>**/*/MANIFEST.MF</exclude>
+ <exclude>**/*.iml</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>.git</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>**/target/**/*</exclude>
+ <!-- The xsd files are CDDL+GLP:
+ Category B: Reciprocal Licenses
+ "For small amounts of source that is directly consumed by the ASF product
+ at runtime in source form, and for which that source is unlikely to be
+ changed anyway (say, by virtue of being specified by a standard), this
+ action is sufficient. An example of this is the web-facesconfig_1_0.dtd,
+ whose inclusion is mandated by the JSR 127: JavaServer Faces specification."
+ http://www.apache.org/legal/3party.html
+ -->
+ <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>
+
+ <!-- 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>
+
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- attach -sources.jar to all our modules -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <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>
+
+ <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.myfaces.buildtools</groupId>
+ <artifactId>myfaces-faces-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-plugin</artifactId>
+ <version>1.0.11</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>myfaces-javascript-plugin</artifactId>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <version>1.0.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.9.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.16</version>
+ </plugin>
+
+ <!-- SITE GENERATION -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <source>8</source>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ <tags>
+ <tag>
+ <name>JSFJspTag</name>
+ <placement>X</placement>
+ </tag>
+ <tag>
+ <name>JSFJspAttribute</name>
+ <placement>X</placement>
+ </tag>
+ </tags>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.12.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </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>
+ <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>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-Papache-release -DperformRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <source>8</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>3.12.0</version>
+ <configuration>
+ <rulesets>
+ <ruleset>/rulesets/java/basic.xml</ruleset>
+ <ruleset>/rulesets/java/unusedcode.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.8</targetJdk>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>pmd</report>
+ <report>cpd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Java EE APIs -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>10.0.0-M9</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
+ <version>10.0.0-M9</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-el-api</artifactId>
+ <version>10.0.0-M9</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>2.0.0-RC1</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.3</version>
+ <scope>provided</scope>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.0-M1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.0.0-RC2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ejb</groupId>
+ <artifactId>jakarta.ejb-api</artifactId>
+ <version>4.0.0-RC2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_2.0_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ <classifier>jakarta</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ <classifier>jakarta</classifier>
+ </dependency>
+
+
+ <!-- UTILITY DEPENDENCIES -->
+
+ <!-- builder-annotations like @JSFWebConfigParam -->
+ <dependency>
+ <groupId>org.apache.myfaces.buildtools</groupId>
+ <artifactId>myfaces-builder-annotations</artifactId>
+ <version>1.0.9</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- tomcat 7 support (InjectionProvider) -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>9.0.14</version>
+ <scope>provided</scope>
+ </dependency>
+
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- easymock -->
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.23.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>de.berlios.jsunit</groupId>
+ <artifactId>jsunit-maven2-plugin</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+
+ <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>
+
+ <!--
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Apache Website</name>
+ <url>scpexe://people.apache.org/www/myfaces.apache.org/core21/</url>
+ </site>
+ </distributionManagement>-->
+ <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>core40</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>
diff --git a/pom.xml b/pom.xml
index 39564f7..f1d9d2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,215 +1,257 @@
-<?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 4.0</name>
- <description>
- This project is the home of the MyFaces implementation of the Jakarta Faces 4.0 specification, and
- consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
- </description>
- <version>4.0.0-SNAPSHOT</version>
- <url>https://myfaces.apache.org/#/core40</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>core40/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 4.0</name>
+ <description>
+ This project is the home of the MyFaces implementation of the Jakarta Faces 4.0 specification, and
+ consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
+ </description>
+ <version>4.0.0-SNAPSHOT</version>
+ <url>https://myfaces.apache.org/#/core40</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>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/README.md</exclude>
+ <exclude>**/*/MANIFEST.MF</exclude>
+ <exclude>**/*.iml</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>.git</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>**/target/**/*</exclude>
+ <!-- The xsd files are CDDL+GLP:
+ Category B: Reciprocal Licenses
+ "For small amounts of source that is directly consumed by the ASF product
+ at runtime in source form, and for which that source is unlikely to be
+ changed anyway (say, by virtue of being specified by a standard), this
+ action is sufficient. An example of this is the web-facesconfig_1_0.dtd,
+ whose inclusion is mandated by the JSR 127: JavaServer Faces specification."
+ http://www.apache.org/legal/3party.html
+ -->
+ <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>
+
+ <!-- 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>
+
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>core40/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