[SCM-518] wrong model in vss-settings.mdo works only with a bug in Modello 1.0-alpha-21 but not with Modello 1.0+
diff --git a/maven-scm-providers/maven-scm-provider-vss/pom.xml b/maven-scm-providers/maven-scm-provider-vss/pom.xml
index c81608f..4cebeda 100644
--- a/maven-scm-providers/maven-scm-provider-vss/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-vss/pom.xml
@@ -51,42 +51,41 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-21</version><!-- Workaround for SCM-518 -->
<executions>
<execution>
+ <id>generate-xsd-site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.reporting.outputDirectory}/xsd</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-docs</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>xdoc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>standard</id>
<goals>
<goal>java</goal>
<goal>xpp3-reader</goal>
<goal>xpp3-writer</goal>
- <goal>xsd</goal>
</goals>
</execution>
</executions>
<configuration>
<version>1.0.0</version>
- <model>src/main/mdo/vss-settings.mdo</model>
+ <useJava5>true</useJava5>
+ <models>
+ <model>src/main/mdo/vss-settings.mdo</model>
+ </models>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>add-modello-source-needed-by-eclipse-since-we-cant-upgrade-modello-maven-plugin</id>
- <!-- maven actually ignores this goal since it is already done by modello-m-p -->
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/modello</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
index bc57633..d89ed62 100644
--- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
+++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/VssCommandLineUtilsTest.java
@@ -60,7 +60,7 @@
final String vssInstallPath = "c:\\wherever";
final String vssInstallPathAlt = "c:\\somewhere";
final String settingsXml =
- "<vss-settings><Settings><vssDirectory>" + vssInstallPath + "</vssDirectory></Settings></vss-settings>";
+ "<vss-settings><vssDirectory>" + vssInstallPath + "</vssDirectory></vss-settings>";
final String settingsFilename = "vss-settings.xml";
final String backupFilename = settingsFilename + ".backup";
boolean preExistingScmFolder = false;
diff --git a/src/site/apt/vss.apt b/src/site/apt/vss.apt
index cbabbe1..197a49e 100644
--- a/src/site/apt/vss.apt
+++ b/src/site/apt/vss.apt
@@ -56,7 +56,7 @@
* Provider Configuration
- The provider configuration is defined in <<<${user.home}/.scm/vss-settings.xml>>>
+ The provider configuration is defined in <<<$\{user.home\}/.scm/vss-settings.xml>>>
** VSS Installation directory
@@ -64,9 +64,7 @@
-------
<vss-settings>
- <Settings>
- <vssDirectory>ss_exe_directory</vssDirectory>
- <Settings>
+ <vssDirectory>ss_exe_directory</vssDirectory>
</vss-settings>
-------
