Skip to content

Commit

Permalink
Merge pull request #1235 from lukasj/bug
Browse files Browse the repository at this point in the history
Add user guides to the main build
  • Loading branch information
scottmarlow authored Mar 1, 2024
2 parents ccc8bec + 4d22dc5 commit da90b3c
Show file tree
Hide file tree
Showing 31 changed files with 122 additions and 86 deletions.
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<module>samples</module>
<module>servlet</module>
<module>signaturetest</module>
<module>user_guides</module>
<module>webartifacts/jsf</module>
<module>webartifacts/jsp</module>
<module>webartifacts/jstl</module>
Expand Down
14 changes: 0 additions & 14 deletions user_guides/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,6 @@
<freemarker.version>2.3.32</freemarker.version>
</properties>

<modules>
<module>../connector</module>
<module>../jacc</module>
<module>../jaxws</module>
<module>../jms</module>
<module>../jpa</module>
<module>../jsp</module>
<module>../jstl</module>
<module>../jta</module>
<module>../saaj</module>
<module>../websocket</module>
<module>../../user_guides</module>
</modules>

<build>
<defaultGoal>package</defaultGoal>
<pluginManagement>
Expand Down
99 changes: 99 additions & 0 deletions user_guides/platform/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2024 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.tck</groupId>
<artifactId>jakarta.tck.user-guide</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-tck-user-guide</artifactId>
<packaging>pom</packaging>
<version>11.0.0-SNAPSHOT</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta EE Platform, Enterprise Edition, Release 11.0 ${project.version}</name>

<properties>
<ug.resources.version>${project.parent.version}</ug.resources.version>

<jakarta.spec.name>EE</jakarta.spec.name>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
</properties>

<distributionManagement>
<site>
<url>scm:git:[email protected]:eclipse-ee4j/jakartaee-tck.git</url>
</site>
</distributionManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>build-dist</id>
<phase>package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-toc</id>
<phase>generate-sources</phase>
</execution>
<execution>
<id>generate-book</id>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<executions>
<execution>
<id>build-site</id>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-pdf-doc</id>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
File renamed without changes.
94 changes: 22 additions & 72 deletions user_guides/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,84 +16,34 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.tck</groupId>
<artifactId>jakarta.tck.user-guide</artifactId>
<version>11.0.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
<artifactId>project</artifactId>
<version>10.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-tck-user-guide</artifactId>
<packaging>pom</packaging>
<artifactId>jakarta.tck-user-guide-parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta EE Platform, Enterprise Edition, Release 11.0 ${project.version}</name>

<properties>
<ug.resources.version>${project.parent.version}</ug.resources.version>

<jakarta.spec.name>EE</jakarta.spec.name>
<!-- status: DRAFT, BETA, etc., or blank for final -->
<status>DRAFT</status>
</properties>

<distributionManagement>
<site>
<url>scm:git:[email protected]:eclipse-ee4j/jakartaee-tck.git</url>
</site>
</distributionManagement>
<packaging>pom</packaging>
<name>Eclipse Foundation Technology Compatibility Kit User's Guides for Jakarta EE ${project.version}</name>

<modules>
<module>connector</module>
<module>jacc</module>
<module>jaxws</module>
<module>jms</module>
<module>jpa</module>
<module>jsp</module>
<module>jstl</module>
<module>jta</module>
<module>parent</module>
<module>platform</module>
<module>saaj</module>
<module>websocket</module>
</modules>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>build-dist</id>
<phase>package</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.doc</groupId>
<artifactId>glassfish-doc-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-toc</id>
<phase>generate-sources</phase>
</execution>
<execution>
<id>generate-book</id>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jbake</groupId>
<artifactId>jbake-maven-plugin</artifactId>
<executions>
<execution>
<id>build-site</id>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-pdf-doc</id>
<phase>generate-resources</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

0 comments on commit da90b3c

Please sign in to comment.