Skip to content

Commit d07fb64

Browse files
authored
Merge pull request wildfly-extras#25 from yersan/issue-34
[wildfly-extras#34] Update JBoss Parent and github actions
2 parents c259570 + f48268a commit d07fb64

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
os: [ ubuntu-latest ]
2626
jdk: [ 11, 17 ]
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v4
2929
with:
3030
fetch-depth: 0
31-
- uses: actions/cache@v1
31+
- uses: actions/cache@v4
3232
with:
3333
path: ~/.m2/repository
3434
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.jboss</groupId>
1313
<artifactId>jboss-parent</artifactId>
14-
<version>39</version>
14+
<version>47</version>
1515
<relativePath/>
1616
</parent>
1717

src/main/java/org/wildfly/installationmanager/ChannelChange.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public enum Status {ADDED, REMOVED, MODIFIED}
3737
* constructs a channel change. At least one of the channels has to be non-null.
3838
* If both {@code oldChannel} and {@code newChannel} are provided their names have to be the same
3939
*
40-
* @param oldChannel
41-
* @param newChannel
40+
* @param oldChannel - Old channel version
41+
* @param newChannel - New channel version
4242
*/
4343
public ChannelChange(Channel oldChannel, Channel newChannel, Status status) {
4444
this.status = status;
@@ -80,7 +80,7 @@ public Optional<Channel> getNewChannel() {
8080
/**
8181
* name of the modified channel
8282
*
83-
* @return
83+
* @return - name of the channel
8484
*/
8585
public String getName() {
8686
return newChannel.isPresent() ? newChannel.get().getName() : oldChannel.get().getName();

src/main/java/org/wildfly/installationmanager/ManifestVersion.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public class ManifestVersion {
2626

2727
/**
28-
* Type of the channel manifest - Maven GAV or an URL
28+
* Type of the channel manifest - Maven GAV or a URL
2929
*/
3030
public enum Type {MAVEN, URL}
3131

@@ -47,23 +47,23 @@ public ManifestVersion(String channelId, String description, String version, Typ
4747

4848
/**
4949
* channel identifier - either Maven coordinate or an URL
50-
* @return
50+
* @return channel identifier
5151
*/
5252
public String getChannelId() {
5353
return channelId;
5454
}
5555

5656
/**
5757
* human read-able description of the channel version. Can be null if the description is not available.
58-
* @return
58+
* @return channel description
5959
*/
6060
public String getDescription() {
6161
return description;
6262
}
6363

6464
/**
6565
* version of the channel manifest. If the manifest is provided by URL, the hash of the resolved manifest is used instead of version
66-
* @return
66+
* @return channel version
6767
*/
6868
public String getVersion() {
6969
return version;

src/main/java/org/wildfly/installationmanager/spi/InstallationManagerFactory.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ public interface InstallationManagerFactory {
2727
* Creates InstallationManger for server instance located at {@code installationDir}.
2828
* If the provided directory is empty, the manger needs to install the server before attempting any other operations.
2929
*
30-
* @param installationDir
31-
* @param mavenOptions
32-
* @return
30+
* @param installationDir the directory where the server is installed
31+
* @param mavenOptions the options to be used by the manager
32+
* @return the InstallationManager instance
3333
*/
3434
InstallationManager create(Path installationDir, MavenOptions mavenOptions) throws Exception;
3535

3636
/**
3737
* Gets the name of InstallationManager instance
38-
* @return
38+
*
39+
* @return the name of the InstallationManger
3940
*/
4041
String getName();
4142
}

0 commit comments

Comments
 (0)