Skip to content

Commit d469f80

Browse files
dgautierdgautier
authored
Merge branch 'master' into dependabot/maven/io.cucumber-cucumber-picocontainer-7.15.0
2 parents 8f7108d + e84c18b commit d469f80

File tree

5 files changed

+189
-12
lines changed

5 files changed

+189
-12
lines changed

‎.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK 17
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
1717
java-version: '17'
1818
distribution: 'adopt'
@@ -22,11 +22,11 @@ jobs:
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
- name: Upload coverage reports to Codecov
25-
uses: codecov/codecov-action@v3
25+
uses: codecov/codecov-action@v4
2626
env:
2727
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2828
- name: Set up Java for publishing to Maven Central Repository
29-
uses: actions/setup-java@v3
29+
uses: actions/setup-java@v4
3030
with:
3131
java-version: '17'
3232
distribution: 'temurin'

‎.github/workflows/pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
- name: Build with Maven
2121
run: mvn --batch-mode verify -Pcoverage
2222
- name: Upload coverage reports to Codecov
23-
uses: codecov/codecov-action@v3
23+
uses: codecov/codecov-action@v4
2424
env:
2525
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Set up JDK 17
17-
uses: actions/setup-java@v3
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: '17'
2020
distribution: 'adopt'
@@ -28,7 +28,7 @@ jobs:
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
- name: Deploy to Maven Central Repository
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
java-version: '17'
3434
distribution: 'temurin'
@@ -48,7 +48,7 @@ jobs:
4848
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4949
- name: Generate changelog
5050
id: changelog
51-
uses: metcalfc/changelog-generator@v4.1.0
51+
uses: metcalfc/changelog-generator@v4.3.0
5252
with:
5353
myToken: ${{ secrets.GITHUB_TOKEN }}
5454
- name: Create GitHub Release

‎README.adoc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
= Markdown to AsciiDoc converter
22

3-
image:https://badges.gitter.im/Join%20Chat.svg[link="https://gitter.im/bodiam/markdown-to-asciidoc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
43

5-
image:https://travis-ci.org/bodiam/markdown-to-asciidoc.svg["Build Status", link="https://travis-ci.org/bodiam/markdown-to-asciidoc"]
4+
image:https://github.com/bodiam/markdown-to-asciidoc/actions/workflows/maven.yml/badge.svg[Build Status]
5+
image:https://github.com/bodiam/markdown-to-asciidoc/actions/workflows/maven-publish.yml/badge.svg[Publish Status]
6+
7+
image:https://badges.gitter.im/Join%20Chat.svg[link="https://gitter.im/bodiam/markdown-to-asciidoc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
8+
image:https://maven-badges.herokuapp.com/maven-central/nl.jworks.markdown_to_asciidoc/markdown_to_asciidoc/badge.svg?style={style}[link=https://maven-badges.herokuapp.com/maven-central/nl.jworks.markdown_to_asciidoc/markdown_to_asciidoc]
9+
image:https://img.shields.io/github/license/apache/maven.svg?label=License[link=LICENCE]
610

711
A small, lightweight converter for Markdown to http://www.asciidoc.org[AsciiDoc] written in Java, and based on https://github.com/sirthias/pegdown[Pegdown].
812

‎pom.xml

+176-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,55 @@
77
<groupId>nl.jworks.markdown_to_asciidoc</groupId>
88
<artifactId>markdown_to_asciidoc</artifactId>
99
<version>2.0.0-SNAPSHOT</version>
10+
11+
<licenses>
12+
<license>
13+
<name>The Apache License, Version 2.0</name>
14+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
15+
</license>
16+
</licenses>
17+
18+
<developers>
19+
<developer>
20+
<id>bodiam</id>
21+
<name>Erik Pragt</name>
22+
<email>[email protected]</email>
23+
<url>https://github.com/bodiam</url>
24+
</developer>
25+
<developer>
26+
<id>mojavelinux</id>
27+
<name>Dan Allen</name>
28+
<url>https://mojavelinux.com</url>
29+
</developer>
30+
<developer>
31+
<id>matozoid</id>
32+
<name>Danny van Bruggen</name>
33+
<url>http://www.laamella.com</url>
34+
</developer>
35+
<developer>
36+
<id>ahus1</id>
37+
<name>Alexander Schwartz</name>
38+
<email>[email protected]</email>
39+
<url>https://www.ahus1.de</url>
40+
</developer>
41+
<developer>
42+
<id>dgautier</id>
43+
<name>David Gautier</name>
44+
<url>https://dgautier.github.io</url>
45+
</developer>
46+
</developers>
47+
48+
<scm>
49+
<connection>scm:git:https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</connection>
50+
<url>https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</url>
51+
<developerConnection>scm:git:https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</developerConnection>
52+
<tag>HEAD</tag>
53+
</scm>
1054

1155
<properties>
12-
<kotlin.version>1.8.0</kotlin.version>
56+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
58+
<kotlin.version>1.9.22</kotlin.version>
1359
<java.version>17</java.version>
1460
<cucumber.version>7.15.0</cucumber.version>
1561
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -48,7 +94,7 @@
4894
<dependency>
4995
<groupId>commons-io</groupId>
5096
<artifactId>commons-io</artifactId>
51-
<version>2.13.0</version>
97+
<version>2.15.1</version>
5298
<scope>test</scope>
5399
</dependency>
54100
<dependency>
@@ -96,12 +142,139 @@
96142
<plugin>
97143
<groupId>org.apache.maven.plugins</groupId>
98144
<artifactId>maven-surefire-plugin</artifactId>
99-
<version>3.1.2</version>
145+
<version>3.2.3</version>
100146
<configuration>
101147
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
102148
</configuration>
103149
</plugin>
104150
</plugins>
105151
</build>
106152

153+
<profiles>
154+
<profile>
155+
<id>ossrh</id>
156+
<distributionManagement>
157+
<repository>
158+
<id>ossrh</id>
159+
<name>Central Repository OSSRH</name>
160+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
161+
</repository>
162+
<snapshotRepository>
163+
<id>ossrh</id>
164+
<name>Central Repository OSSRH</name>
165+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
166+
</snapshotRepository>
167+
</distributionManagement>
168+
<build>
169+
<plugins>
170+
<plugin>
171+
<groupId>org.apache.maven.plugins</groupId>
172+
<artifactId>maven-gpg-plugin</artifactId>
173+
<version>3.1.0</version>
174+
<executions>
175+
<execution>
176+
<id>sign-artifacts</id>
177+
<phase>verify</phase>
178+
<goals>
179+
<goal>sign</goal>
180+
</goals>
181+
</execution>
182+
</executions>
183+
<configuration>
184+
<!-- Prevent gpg from using pinentry programs. Fixes: gpg: signing
185+
failed: Inappropriate ioctl for device -->
186+
<gpgArguments>
187+
<arg>--pinentry-mode</arg>
188+
<arg>loopback</arg>
189+
</gpgArguments>
190+
</configuration>
191+
</plugin>
192+
<plugin>
193+
<groupId>org.apache.maven.plugins</groupId>
194+
<artifactId>maven-source-plugin</artifactId>
195+
<version>3.3.0</version>
196+
<executions>
197+
<execution>
198+
<id>attach-sources</id>
199+
<goals>
200+
<goal>jar-no-fork</goal>
201+
</goals>
202+
</execution>
203+
</executions>
204+
</plugin>
205+
<plugin>
206+
<groupId>org.apache.maven.plugins</groupId>
207+
<artifactId>maven-javadoc-plugin</artifactId>
208+
<version>3.6.0</version>
209+
<executions>
210+
<execution>
211+
<id>attach-javadocs</id>
212+
<goals>
213+
<goal>jar</goal>
214+
</goals>
215+
</execution>
216+
</executions>
217+
</plugin>
218+
<plugin>
219+
<groupId>org.jetbrains.dokka</groupId>
220+
<artifactId>dokka-maven-plugin</artifactId>
221+
<version>1.9.10</version>
222+
<executions>
223+
<execution>
224+
<phase>package</phase>
225+
<goals>
226+
<goal>javadocJar</goal>
227+
</goals>
228+
</execution>
229+
</executions>
230+
</plugin>
231+
<plugin>
232+
<groupId>org.apache.maven.plugins</groupId>
233+
<artifactId>maven-release-plugin</artifactId>
234+
<version>3.0.1</version>
235+
<configuration>
236+
<scmCommentPrefix>[ci skip]</scmCommentPrefix>
237+
</configuration>
238+
</plugin>
239+
</plugins>
240+
</build>
241+
</profile>
242+
<profile>
243+
<id>github</id>
244+
<distributionManagement>
245+
<repository>
246+
<id>github</id>
247+
<name>GitHub Packages</name>
248+
<url>https://maven.pkg.github.com/markdown-asciidoc/markdown-to-asciidoc</url>
249+
</repository>
250+
</distributionManagement>
251+
</profile>
252+
<profile>
253+
<id>coverage</id>
254+
<build>
255+
<plugins>
256+
<plugin>
257+
<groupId>org.jacoco</groupId>
258+
<artifactId>jacoco-maven-plugin</artifactId>
259+
<version>0.8.11</version>
260+
<executions>
261+
<execution>
262+
<id>prepare-agent</id>
263+
<goals>
264+
<goal>prepare-agent</goal>
265+
</goals>
266+
</execution>
267+
<execution>
268+
<id>jacoco-report</id>
269+
<phase>verify</phase>
270+
<goals>
271+
<goal>report</goal>
272+
</goals>
273+
</execution>
274+
</executions>
275+
</plugin>
276+
</plugins>
277+
</build>
278+
</profile>
279+
</profiles>
107280
</project>

0 commit comments

Comments
 (0)