Skip to content

Commit

Permalink
WIP: manual rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@abelsromero
abelsromero committed Jan 13, 2024
1 parent ec75e4b commit c505848
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 113 deletions.
55 changes: 3 additions & 52 deletions asciidoctor-converter-doxia-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
<description>Asciidoctor Doxia Parser based on Asciidoctor Html converter (for Maven Site integration)</description>
<url>https://github.com/asciidoctor/asciidoctor-maven-plugin</url>

<properties>
<doxia.version>2.0.0-M8</doxia.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
<plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
</properties>

<dependencies>
<dependency>
<groupId>org.asciidoctor</groupId>
Expand All @@ -42,7 +36,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.project.version}</version>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -53,7 +47,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxia.version}</version>
<version>${doxia-site-renderer.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -63,7 +57,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>${plexus.component.metadata.version}</version>
<version>${plexus-component-metadata.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -75,51 +69,8 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${maven.coveralls.plugin.version}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<versionRange>[${plexus.component.metadata.version},)</versionRange>
<goals>
<goal>generate-metadata</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
56 changes: 4 additions & 52 deletions asciidoctor-parser-doxia-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@

<name>Asciidoctor Parser Doxia Module</name>
<description>Asciidoctor Doxia Module based on Asciidoctor AST processing (for Maven Site integration)</description>

<properties>
<doxia.version>2.0.0-M6</doxia.version>
<maven.coveralls.plugin.version>4.3.0</maven.coveralls.plugin.version>
<plexus.component.metadata.version>2.1.1</plexus.component.metadata.version>
</properties>
<url>https://github.com/asciidoctor/asciidoctor-maven-plugin</url>

<dependencies>
<dependency>
Expand All @@ -41,7 +36,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.project.version}</version>
<version>${maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -57,7 +52,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxia.version}</version>
<version>${doxia-site-renderer.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -67,7 +62,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>${plexus.component.metadata.version}</version>
<version>${plexus-component-metadata.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -79,51 +74,8 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>${maven.coveralls.plugin.version}</version>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.3</version>
</dependency>
</dependencies>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<versionRange>[${plexus.component.metadata.version},)</versionRange>
<goals>
<goal>generate-metadata</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
2 changes: 1 addition & 1 deletion asciidoctor-parser-doxia-module/src/it/maven-site-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M8</version>
<version>4.0.0-M13</version>
<configuration>
<asciidoc>
<baseDir>${project.basedir}/src/site/asciidoc</baseDir>
Expand Down
2 changes: 1 addition & 1 deletion asciidoctor-parser-doxia-module/src/it/maven-site-plugin/src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>2.0.0-M6</version>
<version>2.0.0-M8</version>
</skin>
</project>
2 changes: 1 addition & 1 deletion asciidoctor-parser-doxia-module/src/it/maven-site-plugin/validate.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class HtmlAsserter {
}

void containsOrderedList(String... values) {
def found = find("<ol style=\"list-style-type: decimal\"><li>${values.join('</li><li>')}</li></ol>")
def found = find("<ol style=\"list-style-type: decimal;\"><li>${values.join('</li><li>')}</li></ol>")
assertFound("Ordered list", values.join(','), found)
}

Expand Down
10 changes: 5 additions & 5 deletions ...src/test/java/org/asciidoctor/maven/site/ast/processors/OrderedListNodeProcessorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void should_convert_simple_list() {
String html = process(content);

assertThat(html)
.isEqualTo("<ol style=\"list-style-type: decimal\">" +
.isEqualTo("<ol style=\"list-style-type: decimal;\">" +
"<li>ordered item 1</li>" +
"<li>ordered item 2</li></ol>");
}
Expand All @@ -51,15 +51,15 @@ void should_convert_nested_list() {
String html = process(content);

assertThat(html)
.isEqualTo("<ol style=\"list-style-type: decimal\">" +
.isEqualTo("<ol style=\"list-style-type: decimal;\">" +
"<li>ordered item 1" +
"<ol style=\"list-style-type: decimal\">" +
"<ol style=\"list-style-type: decimal;\">" +
"<li>ordered item 1 1</li></ol></li>" +
"<li>ordered item 1 2</li>" +
"<li>ordered item 2" +
"<ol style=\"list-style-type: decimal\">" +
"<ol style=\"list-style-type: decimal;\">" +
"<li>ordered item 2 1" +
"<ol style=\"list-style-type: decimal\">" +
"<ol style=\"list-style-type: decimal;\">" +
"<li>ordered item 2 1 1</li></ol></li></ol></li></ol>");
}

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.java.version>11</project.java.version>
<maven.version>3.9.6</maven.version>
<doxia.version>1.12.0</doxia.version>
<doxia.version>2.0.0-M7</doxia.version>
<doxia-site-renderer.version>2.0.0-M6</doxia-site-renderer.version>
<plexus-component-metadata.version>2.2.0</plexus-component-metadata.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
<jruby.version>9.4.5.0</jruby.version>
Expand Down

0 comments on commit c505848

Please sign in to comment.