Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MJAVADOC-544] - Changed behaviour of Javadoc for temporary files enc…
…oding (options, argfile, ...)
- Loading branch information
1 parent
85729d5
commit 45473e3
Showing
11 changed files
with
589 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...st/java/org/apache/maven/plugins/javadoc/stubs/ArgfileUmlautEncodingMavenProjectStub.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.apache.maven.plugins.javadoc.stubs; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.maven.plugin.testing.stubs.MavenProjectStub; | ||
| import org.apache.maven.model.Scm; | ||
| import org.apache.maven.model.Build; | ||
|
|
||
| import java.util.List; | ||
| import java.util.ArrayList; | ||
| import java.io.File; | ||
|
|
||
| public class ArgfileUmlautEncodingMavenProjectStub | ||
| extends MavenProjectStub | ||
| { | ||
| private Scm scm; | ||
|
|
||
| public ArgfileUmlautEncodingMavenProjectStub() | ||
| { | ||
| readModel( new File( getBasedir(), "argfileumlautencoding-test-plugin-config.xml" ) ); | ||
|
|
||
| setGroupId( "org.apache.maven.plugins.maven-javadoc-plugin.unit" ); | ||
| setArtifactId( "argfileumlautencoding-test" ); | ||
| setVersion( "1.0-SNAPSHOT" ); | ||
| setName( "Maven Javadoc Plugin Argfile Umlaut Encoding Test" ); | ||
| setUrl( "http://maven.apache.org" ); | ||
| setPackaging( "jar" ); | ||
|
|
||
| Scm scm = new Scm(); | ||
| scm.setConnection( "scm:svn:http://svn.apache.org/maven/sample/trunk" ); | ||
| setScm( scm ); | ||
|
|
||
| Build build = new Build(); | ||
| build.setFinalName( "argfileumlautencoding-test" ); | ||
| build.setDirectory( super.getBasedir() + "/target/test/unit/argfileumlautencoding-test/target" ); | ||
| setBuild( build ); | ||
|
|
||
| List<String> compileSourceRoots = new ArrayList<>(); | ||
| compileSourceRoots.add( getBasedir() + "/argfileumlautencoding/test" ); | ||
| setCompileSourceRoots( compileSourceRoots ); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public Scm getScm() | ||
| { | ||
| return scm; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public void setScm( Scm scm ) | ||
| { | ||
| this.scm = scm; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public File getBasedir() | ||
| { | ||
| return new File( super.getBasedir() + "/src/test/resources/unit/argfileumlautencoding-test" ); | ||
| } | ||
| } |
80 changes: 80 additions & 0 deletions
80
...st/java/org/apache/maven/plugins/javadoc/stubs/OptionsUmlautEncodingMavenProjectStub.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.apache.maven.plugins.javadoc.stubs; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.maven.plugin.testing.stubs.MavenProjectStub; | ||
| import org.apache.maven.model.Scm; | ||
| import org.apache.maven.model.Build; | ||
|
|
||
| import java.util.List; | ||
| import java.util.ArrayList; | ||
| import java.io.File; | ||
|
|
||
| public class OptionsUmlautEncodingMavenProjectStub | ||
| extends MavenProjectStub | ||
| { | ||
| private Scm scm; | ||
|
|
||
| public OptionsUmlautEncodingMavenProjectStub() | ||
| { | ||
| readModel( new File( getBasedir(), "optionsumlautencoding-test-plugin-config.xml" ) ); | ||
|
|
||
| setGroupId( "org.apache.maven.plugins.maven-javadoc-plugin.unit" ); | ||
| setArtifactId( "optionsumlautencoding-test" ); | ||
| setVersion( "1.0-SNAPSHOT" ); | ||
| setName( "Maven Javadoc Plugin Options Umlaut Encoding Test" ); | ||
| setUrl( "http://maven.apache.org" ); | ||
| setPackaging( "jar" ); | ||
|
|
||
| Scm scm = new Scm(); | ||
| scm.setConnection( "scm:svn:http://svn.apache.org/maven/sample/trunk" ); | ||
| setScm( scm ); | ||
|
|
||
| Build build = new Build(); | ||
| build.setFinalName( "optionsumlautencoding-test" ); | ||
| build.setDirectory( super.getBasedir() + "/target/test/unit/optionsumlautencoding-test/target" ); | ||
| setBuild( build ); | ||
|
|
||
| List<String> compileSourceRoots = new ArrayList<>(); | ||
| compileSourceRoots.add( getBasedir() + "/optionsumlautencoding/test" ); | ||
| setCompileSourceRoots( compileSourceRoots ); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public Scm getScm() | ||
| { | ||
| return scm; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public void setScm( Scm scm ) | ||
| { | ||
| this.scm = scm; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override | ||
| public File getBasedir() | ||
| { | ||
| return new File( super.getBasedir() + "/src/test/resources/unit/optionsumlautencoding-test" ); | ||
| } | ||
| } |
Oops, something went wrong.