Skip to content

Commit d699464

Browse files
authored
Version 1.1.1
1 parent 57db4b6 commit d699464

File tree

18 files changed

+293
-214
lines changed

18 files changed

+293
-214
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ about: Please create a bug report to help us solve any problems and improve the
44
title: ''
55
labels: bug
66
assignees: ''
7-
87
---
98

9+
## Issue details
10+
1011
### Description
1112

1213
Please give a short description of the problem in one or two sentences...

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ about: Feel free to suggest an idea for this project
44
title: ''
55
labels: enhancement
66
assignees: ''
7-
87
---
98

9+
## Issue details
10+
1011
### Description
1112

1213
Please give a short description of the request in one or two sentences...

.github/workflows/java.macos.test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [macos-latest]
13-
java-version: [8, 11, 15]
13+
java-version: [17, 21, 25]
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Setup JDK ${{ matrix.java-version }}

.github/workflows/java.ubuntu.test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12-
os: [ubuntu-18.04, ubuntu-latest]
13-
java-version: [8, 11, 15]
12+
os: [ubuntu-22.04, ubuntu-latest]
13+
java-version: [17, 21, 25]
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Setup JDK ${{ matrix.java-version }}

.github/workflows/java.windows.test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [windows-latest]
13-
java-version: [8, 11, 15]
13+
java-version: [17, 21, 25]
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: Setup JDK ${{ matrix.java-version }}

CONTRIBUTING.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ There are two main branches with infinite lifetime:
8383
In addition, a number of support branches with the following
8484
naming conventions may be used:
8585

86-
* `hotfix-<version>` is a branch from `master` in which urgent bugs are fixed
86+
* `patch/<version>` is a branch from `master` in which urgent bugs are fixed
8787
and then pulled into `master` for a bugfix release (with the `<version>`
88-
being `1.0.z` for example); a hotfix should also be merged into `develop`.
89-
* `release-<version>` is a branch from `develop` used, as required, for
88+
being `1.0.z` for example); a patch should also be merged into `develop`.
89+
* `rel/<version>` is a branch from `develop` used, as required, for
9090
integration and testing of a specific major or minor release (with the
9191
`<version>` being `x.y.0`); upon completion the release is pulled into
9292
`master` and should also be merged into `develop`.
@@ -139,5 +139,3 @@ Classes should be organised as follows:
139139
* put logical and concatination operators at the beginning of a new line
140140
3. Comment your code, but avoid commenting the obvious:
141141
* modules, classes, and functions must be described using `javadoc`
142-
143-
Further guidance will follow.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ To use the WFJL, its [GitHub package](https://github.com/WhiteflagProtocol/white
3333
should be added to your project as a dependency using the following
3434
"group:artifact:version" information, with the most recently published version:
3535

36-
`org.whiteflagprotocol.java:whiteflag-java:1.1.0`
36+
`org.whiteflagprotocol.java:whiteflag-java:1.1.1`
3737

3838
For example, when using [Gradle](https://gradle.org/), the following should be
3939
included in your `build.gradle` file:
4040

4141
```groovy
4242
dependencies {
43-
implementation 'org.whiteflagprotocol.java:whiteflag-java:1.1.0'
43+
implementation 'org.whiteflagprotocol.java:whiteflag-java:1.1.1'
4444
}
4545
```
4646

@@ -50,7 +50,7 @@ or in your `pom.xml` when using [Maven](https://maven.apache.org/):
5050
<dependency>
5151
<groupId>org.whiteflagprotocol.java</groupId>
5252
<artifactId>whiteflag-java</artifactId>
53-
<version>1.1.0</version>
53+
<version>1.1.1</version>
5454
</dependency>
5555
```
5656

build.gradle

Lines changed: 38 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,71 @@
22
* Gradle build file for the Whiteflag Java Library
33
*/
44

5-
// Project information
6-
version = '1.1.0'
5+
/* Plugins */
6+
plugins {
7+
id 'java'
8+
id 'java-library'
9+
id 'java-library-distribution'
10+
id 'distribution'
11+
id 'maven-publish'
12+
}
13+
/* Project information */
14+
version = '1.1.1'
715
group = 'org.whiteflagprotocol.java'
816

9-
// Display basic information
17+
/* Display basic information */
1018
println "Configuration for ${project.rootProject}";
1119
println " project: ${project.name}"
1220
println " group: ${project.group}"
1321
println " version: ${project.version}";
1422
println " directory: ${project.projectDir}";
1523

16-
// Plugins
17-
apply plugin: 'java'
18-
apply plugin: 'java-library'
19-
apply plugin: 'java-library-distribution'
20-
apply plugin: 'maven-publish'
21-
22-
// Repositories and Dependencies
24+
/* Repositories and Dependencies */
2325
repositories {
2426
mavenCentral()
2527
}
26-
2728
dependencies {
2829
testImplementation 'junit:junit:4.13.2'
2930
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
3031
implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
3132
}
32-
33-
// Test behaviour
34-
test {
35-
testLogging {
36-
events "FAILED", "STANDARD_OUT", "STANDARD_ERROR"
37-
}
38-
}
39-
40-
// Include documentation and source
41-
java {
42-
withJavadocJar()
43-
withSourcesJar()
44-
}
45-
46-
// Metadata
33+
/* Metadata */
4734
jar {
4835
manifest {
4936
attributes('Implementation-Title': project.name,
5037
'Implementation-Version': project.version)
5138
}
5239
}
53-
54-
// Distribution
40+
/* Testing */
41+
test {
42+
testLogging {
43+
events "FAILED", "STANDARD_OUT", "STANDARD_ERROR"
44+
}
45+
}
46+
/* Distribution */
5547
distributions {
5648
main {
5749
distributionBaseName = project.name
5850
}
5951
}
60-
61-
// Publishing library as package
52+
/* Include documentation and source */
53+
java {
54+
withJavadocJar()
55+
withSourcesJar()
56+
}
57+
/* Documentation */
58+
javadoc {
59+
options.tags = [ 'wfver:a:Whiteflag version:',
60+
'wfref:a:Whiteflag standard x-reference:' ]
61+
options.stylesheetFile = project.file("src/main/javadoc/style.css")
62+
options.overview = "src/main/javadoc/overview.html"
63+
}
64+
task docs(type: Copy) {
65+
dependsOn javadoc
66+
from "$buildDir/docs/javadoc"
67+
into "docs/javadoc"
68+
}
69+
/* Publishing library as package */
6270
publishing {
6371
repositories {
6472
maven {
@@ -83,18 +91,3 @@ publishing {
8391
}
8492
}
8593
}
86-
87-
// Javadoc options
88-
javadoc {
89-
options.tags = [ 'wfver:a:Whiteflag version:',
90-
'wfref:a:Whiteflag standard x-reference:' ]
91-
options.stylesheetFile = project.file("src/main/javadoc/style.css")
92-
options.overview = "src/main/javadoc/overview.html"
93-
}
94-
95-
// Task to build documentation
96-
task docs(type: Copy) {
97-
dependsOn javadoc
98-
from "$buildDir/docs/javadoc"
99-
into "docs/javadoc"
100-
}

docs/index.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,36 @@ blockchain, database solution, user interface, etc.
2323
* [Exception Handling](md/errors.md)
2424
* [Whiteflag Messages](md/messages.md)
2525
* [Cryptography](md/crypto.md)
26+
27+
## Installation
28+
29+
To use the WFJL, its [GitHub package](https://github.com/WhiteflagProtocol/whiteflag-java/packages)
30+
should be added to your project as a dependency using the following
31+
"group:artifact:version" information, with the most recently published version:
32+
33+
`org.whiteflagprotocol.java:whiteflag-java:1.1.0`
34+
35+
For example, when using [Gradle](https://gradle.org/), the following should be
36+
included in your `build.gradle` file:
37+
38+
```groovy
39+
dependencies {
40+
implementation 'org.whiteflagprotocol.java:whiteflag-java:1.1.1'
41+
}
42+
```
43+
44+
or in your `pom.xml` when using [Maven](https://maven.apache.org/):
45+
46+
```xml
47+
<dependency>
48+
<groupId>org.whiteflagprotocol.java</groupId>
49+
<artifactId>whiteflag-java</artifactId>
50+
<version>1.1.0</version>
51+
</dependency>
52+
```
53+
54+
Note that you also need to add the GitHub WFJL package repository URL `https://maven.pkg.github.com/whiteflagprotocol/whiteflag-java`
55+
to your project. Please see the GitHub documentation for detailed information
56+
about installing packages from the GitHub repository with either
57+
[Maven](https://docs.github.com/en/packages/guides/configuring-apache-maven-for-use-with-github-packages#installing-a-package)
58+
or [Gradle](https://docs.github.com/en/packages/guides/configuring-gradle-for-use-with-github-packages#installing-a-package).

docs/md/crypto.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# WFJL Whiteflag Messages
22

3-
Go back to the [WFJL Documentation Home](../index.md) or visit
4-
the detailed [WFJL Javadoc API Reference](../javadoc)
3+
| [WFJL Documentation Home](../index.md) | [WFJL Javadoc Reference](../javadoc) | [Whiteflag Specification](https://standard.whiteflagprotocol.org) |
54

65
## Overview
76

0 commit comments

Comments
 (0)