Add EFTL profile that provides a zip distribution with the EFTL license
diff --git a/tck/docs/LICENSE.html b/tck/LICENSE-EFTL.html similarity index 100% rename from tck/docs/LICENSE.html rename to tck/LICENSE-EFTL.html
diff --git a/tck/docs/userguide/pom.xml b/tck/docs/userguide/pom.xml index f0b3244..89d730b 100644 --- a/tck/docs/userguide/pom.xml +++ b/tck/docs/userguide/pom.xml
@@ -33,17 +33,6 @@ <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 6.1</name> - <!-- - Override the license in the parent POM as TCKs all use the EFTL. - --> - <licenses> - <license> - <name>Eclipse Foundation Technology Compatibility Kit License - v1.1</name> - <url>https://www.eclipse.org/legal/tck/</url> - <distribution>repo</distribution> - </license> - </licenses> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <site.output.dir>${project.build.directory}/staging</site.output.dir>
diff --git a/tck/pom.xml b/tck/pom.xml index 1b756b4..9be8e19 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -36,17 +36,6 @@ <description>Jakarta Expression Language TCK</description> <url>https://projects.eclipse.org/projects/ee4j.el</url> - <!-- - Override the license in the parent POM as TCKs all use the EFTL. - --> - <licenses> - <license> - <name>Eclipse Foundation Technology Compatibility Kit License - v1.1</name> - <url>https://www.eclipse.org/legal/tck/</url> - <distribution>repo</distribution> - </license> - </licenses> - <developers> <developer> <id>jakarta-ee4j-el</id> @@ -208,29 +197,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.8.0</version> - <executions> - <execution> - <id>distribution</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <escapeString>\</escapeString> - <appendAssemblyId>false</appendAssemblyId> - <finalName>${bundle-name}-${project.version}</finalName> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -263,6 +229,42 @@ </build> </profile> + <profile> + <!-- Enable the EFTL profile to build the EFTL licensed *.zip distribution which is staged to --> + <!-- https://download.eclipse.org/ee4j/expression-language/jakartaeeXX/staged/eftl/ --> + <!-- Generally, this profile will only be used by CI to perform the staging or developers --> + <!-- testing the build process for the staged artefact. --> + <id>EFTL</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.8.0</version> + <executions> + <execution> + <id>distribution</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <escapeString>\</escapeString> + <appendAssemblyId>false</appendAssemblyId> + <finalName>${bundle-name}-${project.version}</finalName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
diff --git a/tck/src/main/assembly/assembly.xml b/tck/src/main/assembly/assembly.xml index 3e2ec1d..3dd09a8 100644 --- a/tck/src/main/assembly/assembly.xml +++ b/tck/src/main/assembly/assembly.xml
@@ -28,7 +28,7 @@ <files> <file> - <source>${project.basedir}/docs/LICENSE.html</source> + <source>${project.basedir}/LICENSE-EFTL.html</source> <destName>LICENSE.html</destName> </file> <file>