Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rollback Java 7 breaking change #53

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doxia-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,7 @@ else if ( ( parser.getName().equals( HtmlMarkup.CODE.toString() ) )
|| ( parser.getName().equals( HtmlMarkup.SAMP.toString() ) )
|| ( parser.getName().equals( HtmlMarkup.TT.toString() ) ) )
{
attribs.addAttributes( SinkEventAttributeSet.Semantics.CODE );
sink.inline( attribs );
sink.inline( SinkEventAttributeSet.Semantics.CODE );
}
else if ( parser.getName().equals( HtmlMarkup.A.toString() ) )
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1905,9 +1905,7 @@ private void inlineSemantics( SinkEventAttributes attributes, String semantic,
{
if ( attributes.containsAttribute( SinkEventAttributes.SEMANTICS, semantic ) )
{
SinkEventAttributes attributesNoSemantics = ( SinkEventAttributes ) attributes.copyAttributes();
attributesNoSemantics.removeAttribute( SinkEventAttributes.SEMANTICS );
writeStartTag( tag, attributesNoSemantics );
writeStartTag( tag );
tags.add( 0, tag );
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1782,9 +1782,7 @@ private void inlineSemantics( SinkEventAttributes attributes, String semantic,
{
if ( attributes.containsAttribute( SinkEventAttributes.SEMANTICS, semantic ) )
{
SinkEventAttributes attributesNoSemantics = ( SinkEventAttributes ) attributes.copyAttributes();
attributesNoSemantics.removeAttribute( SinkEventAttributes.SEMANTICS );
writeStartTag( tag, attributesNoSemantics );
writeStartTag( tag );
tags.add( 0, tag );
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.StandardCharsets;

/**
* Provide some common convenience methods to test Doxia modules (parsers and sinks).
Expand Down Expand Up @@ -173,7 +172,7 @@ protected Reader getTestReader( String baseName, String extension )

assertNotNull( "Could not find resource: " + baseName + "." + extension, is );

return new InputStreamReader( is, StandardCharsets.UTF_8 );
return new InputStreamReader( is );
}

/**
Expand Down
2 changes: 1 addition & 1 deletion doxia-logging-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-apt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-confluence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-docbook-simple/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-fml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-fo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-itext/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion doxia-modules/doxia-module-latex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>doxia-modules</artifactId>
<groupId>org.apache.maven.doxia</groupId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
77 changes: 1 addition & 76 deletions doxia-modules/doxia-module-markdown/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.9.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -72,80 +72,5 @@ under the License.
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
<build>

<plugins>

<!-- install -->
<plugin>
<artifactId>maven-install-plugin</artifactId>
<executions>

<!-- integration-test -->
<!-- Copy the Doxia XHTML module from our working directory to the local-repo -->
<!-- We do that manually because the invoker:install goal (below) doesn't do it, as -->
<!-- it's not the artifact we're working on, but the ones that are produced by our "siblings" -->
<execution>
<id>copy-doxia-module-xhtml-to-local-repo</id>
<phase>integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<file>${project.basedir}/../doxia-module-xhtml/target/doxia-module-xhtml-${project.version}.jar</file>
</configuration>
</execution>
<execution>
<id>copy-doxia-to-local-repo</id>
<phase>integration-test</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<file>${project.basedir}/../../doxia-core/target/doxia-core-${project.version}.jar</file>
</configuration>
</execution>
</executions>
</plugin>

<!-- maven-invoker-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<!-- <version>2.0.0</version> -->
<configuration>
<debug>false</debug>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
<pomIncludes>
<pomInclude>**/pom.xml</pomInclude>
</pomIncludes>
<postBuildHookScript>verify</postBuildHookScript>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<extraArtifacts></extraArtifacts>
<settingsFile>src/it/settings.xml</settingsFile>
<goals>
<goal>clean</goal>
<goal>site</goal>
</goals>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading