Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/io.cucumber-cucumber-pico…
Browse files Browse the repository at this point in the history 
…container-7.15.0
  • Loading branch information
@dgautier
dgautier committed Feb 14, 2024
2 parents 8f7108d + e84c18b commit d469f80
Show file tree
Hide file tree
Showing 5 changed files with 189 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -22,11 +22,11 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
- name: Set up Java for publishing to Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
- name: Build with Maven
run: mvn --batch-mode verify -Pcoverage
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -28,7 +28,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Deploy to Maven Central Repository
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -48,7 +48,7 @@ jobs:
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v4.1.0
uses: metcalfc/changelog-generator@v4.3.0
with:
myToken: ${{ secrets.GITHUB_TOKEN }}
- name: Create GitHub Release
Expand Down
8 changes: 6 additions & 2 deletions README.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
= Markdown to AsciiDoc converter

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"]

image:https://travis-ci.org/bodiam/markdown-to-asciidoc.svg["Build Status", link="https://travis-ci.org/bodiam/markdown-to-asciidoc"]
image:https://github.com/bodiam/markdown-to-asciidoc/actions/workflows/maven.yml/badge.svg[Build Status]
image:https://github.com/bodiam/markdown-to-asciidoc/actions/workflows/maven-publish.yml/badge.svg[Publish Status]

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"]
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]
image:https://img.shields.io/github/license/apache/maven.svg?label=License[link=LICENCE]

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

Expand Down
179 changes: 176 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,55 @@
<groupId>nl.jworks.markdown_to_asciidoc</groupId>
<artifactId>markdown_to_asciidoc</artifactId>
<version>2.0.0-SNAPSHOT</version>

<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<id>bodiam</id>
<name>Erik Pragt</name>
<email>erik.pragt@jworks.nl</email>
<url>https://github.com/bodiam</url>
</developer>
<developer>
<id>mojavelinux</id>
<name>Dan Allen</name>
<url>https://mojavelinux.com</url>
</developer>
<developer>
<id>matozoid</id>
<name>Danny van Bruggen</name>
<url>http://www.laamella.com</url>
</developer>
<developer>
<id>ahus1</id>
<name>Alexander Schwartz</name>
<email>alexander.schwartz@gmx.net</email>
<url>https://www.ahus1.de</url>
</developer>
<developer>
<id>dgautier</id>
<name>David Gautier</name>
<url>https://dgautier.github.io</url>
</developer>
</developers>

<scm>
<connection>scm:git:https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</connection>
<url>https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</url>
<developerConnection>scm:git:https://github.com/markdown-asciidoc/markdown-to-asciidoc.git</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<kotlin.version>1.8.0</kotlin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<kotlin.version>1.9.22</kotlin.version>
<java.version>17</java.version>
<cucumber.version>7.15.0</cucumber.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down Expand Up @@ -48,7 +94,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.13.0</version>
<version>2.15.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -96,12 +142,139 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.3</version>
<configuration>
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>ossrh</id>
<distributionManagement>
<repository>
<id>ossrh</id>
<name>Central Repository OSSRH</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<name>Central Repository OSSRH</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<!-- Prevent gpg from using pinentry programs. Fixes: gpg: signing
failed: Inappropriate ioctl for device -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.9.10</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<scmCommentPrefix>[ci skip]</scmCommentPrefix>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>github</id>
<distributionManagement>
<repository>
<id>github</id>
<name>GitHub Packages</name>
<url>https://maven.pkg.github.com/markdown-asciidoc/markdown-to-asciidoc</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>coverage</id>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit d469f80

Please sign in to comment.