Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix site build #22

Merged
merged 1 commit into from
Jan 23, 2022
Merged

Fix site build #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions doxia-integration-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
<name>Doxia Sitetools :: Integration Tools</name>
<description>A collection of tools to help the integration of Doxia Sitetools in Maven plugins.</description>

<properties>
<mavenVersion>2.2.1</mavenVersion>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
Expand Down
2 changes: 1 addition & 1 deletion doxia-site-renderer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.0</version>
<version>${mavenVersion}</version>
</dependency>

<dependency>
Expand Down
5 changes: 3 additions & 2 deletions ...e-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.doxia.Doxia;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
Expand Down Expand Up @@ -359,7 +359,8 @@ public void testVelocityToolManagerForSkin()
*/
attributes.put( "doxiaSiteRendererVersion", "1.7-bogus" );

Artifact skin = new DefaultArtifact( "org.group", "artifact", "1.1", null, "jar", "", null );
Artifact skin = new DefaultArtifact( "org.group", "artifact",
VersionRange.createFromVersion( "1.1" ), null, "jar", "", null );
skin.setFile( skinFile );
SiteRenderingContext siteRenderingContext =
renderer.createContextForSkin( skin, attributes, new DecorationModel(), "defaultWindowTitle",
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ under the License.
<properties>
<doxiaVersion>2.0.0-M1</doxiaVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<mavenVersion>2.2.1</mavenVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2021-12-12T17:08:52Z</project.build.outputTimestamp>
</properties>
Expand Down