Skip to content

Commit

Permalink
feat/javadoc : [AUTOMATE JAVADOC]
Browse files Browse the repository at this point in the history
Signed-off-by: Samir Romdhani <samir.romdhani@rte-france.com>

feat/javadoc manifest test fixes#jdk17

Signed-off-by: Samir Romdhani <samir.romdhani@rte-france.com>

fixes : microprofile/microprofile-fault-tolerance#512 , NationalSecurityAgency/ghidra#1284
Signed-off-by: Samir Romdhani <samir.romdhani@rte-france.com>
  • Loading branch information
samirromdhani committed Jan 26, 2023
1 parent 29aa5fa commit 50ab010
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 20 deletions.
File renamed without changes.
19 changes: 15 additions & 4 deletions .github/workflows/automate_javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,22 @@ jobs:
runs-on: ubuntu-latest
env:
from_branch: feat/javadoc
target_branch: feat/117_Documentation_SCD_Generation_Process
target_branch: develop
steps:
# Use develop as base branch to generate javadoc
- name: Setup Environment
- name: Checkout
uses: actions/checkout@v3
# Use develop as base branch to generate javadoc
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
ref: ${{ env.target_branch }}
# - name: Setup Environment
# uses: actions/checkout@v3
# with:
# distribution: 'zulu'
# java-version: '17'
# ref: ${{ env.from_branch }}

- name: Create custom Maven Settings.xml
uses: whelk-io/maven-settings-xml-action@v21
Expand Down Expand Up @@ -49,6 +56,10 @@ jobs:
yes | cp -Rf target/site/apidocs/* docs/javadoc/
git checkout -b ${{ env.from_branch }}-pull-request
- name: Commit files
run: |
git commit -a -m "[feat/javadoc]: update javadoc"
# Note that will fail if branch already exists.
- name: Push Git Branch
uses: ad-m/github-push-action@v0.6.0
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<configuration>
<doctitle>${javadoc.title}</doctitle>
<doclint>${javadoc.lint}</doclint>
<additionalJOption>--no-module-directories</additionalJOption>
<!-- <additionalJOption>&#45;&#45;no-module-directories</additionalJOption>-->
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>sct-app is a group of automation services</h3>
* <h2>sct-app is a group of automation services</h2>
*/
package org.lfenergy.compas.sct.app;
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>sct.commons.dto is a group of DTO utils for operating on
* <h2>sct.commons.dto is a group of DTO utils for operating on
* {@link org.lfenergy.compas.scl2007b4.model.SCL SCL} services
* </h3>
* </h2>
*/
package org.lfenergy.compas.sct.commons.dto;
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>scl.com is a group of services for operating on
* <h2>scl.com is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.TCommunication Communication} object
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.TCommunication
* @see org.lfenergy.compas.scl2007b4.model.TSubNetwork
* @see org.lfenergy.compas.scl2007b4.model.TConnectedAP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>scl.dtt is a group of services for operating on
* <h2>scl.dtt is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.TDataTypeTemplates DataTypeTemplates} object
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.TLNodeType
* @see org.lfenergy.compas.scl2007b4.model.TDOType
* @see org.lfenergy.compas.scl2007b4.model.TDAType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>scl.header is a group of services for operating on
* <h2>scl.header is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.THeader Header} object
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.THeader
* @see org.lfenergy.compas.scl2007b4.model.THitem
* @see <a href="https://github.com/com-pas/compas-sct/issues/6" target="_blank">Issue !6</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>scl.ied is a group of services for operating on
* <h2>scl.ied is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.TIED IED} object
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.TAccessPoint
* @see org.lfenergy.compas.scl2007b4.model.TServices
* @see org.lfenergy.compas.scl2007b4.model.TLDevice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
// SPDX-License-Identifier: Apache-2.0

/**
* <h3>commons.scl is a group of services for operating on
* <h2>commons.scl is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.THeader Header} ,
* {@link org.lfenergy.compas.scl2007b4.model.TSubstation Substation} ,
* {@link org.lfenergy.compas.scl2007b4.model.TCommunication Communication} ,
* {@link org.lfenergy.compas.scl2007b4.model.TIED IED} ,
* {@link org.lfenergy.compas.scl2007b4.model.TDataTypeTemplates DataTypeTemplates} objects
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.SCL
*/
package org.lfenergy.compas.sct.commons.scl;
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: Apache-2.0
/**
* <h3>scl.sstation is a group of services for operating on
* <h2>scl.sstation is a group of services for operating on
* {@link org.lfenergy.compas.scl2007b4.model.TSubstation Substation} object
* </h3>
* </h2>
* @see org.lfenergy.compas.scl2007b4.model.TVoltageLevel
* @see org.lfenergy.compas.scl2007b4.model.TFunction
* @see org.lfenergy.compas.scl2007b4.model.TBay
Expand Down

0 comments on commit 50ab010

Please sign in to comment.