You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by he...@apache.org on 2022/07/20 19:05:54 UTC
[maven-scm-publish-plugin] branch master updated: [MSCMPUB-50] Fix typo in 'skipDeployement'
This is an automated email from the ASF dual-hosted git repository.
henning pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new d70abc9 [MSCMPUB-50] Fix typo in 'skipDeployement'
d70abc9 is described below
commit d70abc959581e105dec3b5eae8bbf3fd03732986
Author: Henning P. Schmiedehausen <he...@schmiedehausen.org>
AuthorDate: Wed Jul 20 12:02:32 2022 -0700
[MSCMPUB-50] Fix typo in 'skipDeployement'
This adds a new property with the correct spelling and deprecates the
old property which is still supported.
Also adds integration tests for both properties.
---
src/it/issue-mscmpub-50/invoker.properties | 21 +++++
src/it/issue-mscmpub-50/pom.xml | 101 +++++++++++++++++++++
src/it/issue-mscmpub-50/setup.bsh | 25 +++++
.../java/org/apache/maven/it/ThisHasJavadoc.java | 34 +++++++
src/it/issue-mscmpub-50/src/site/apt/index.apt | 20 ++++
.../src/site/resources/trunk/readme.txt | 2 +
src/it/issue-mscmpub-50/src/site/site.xml | 34 +++++++
src/it/issue-mscmpub-50/verify.bsh | 24 +++++
src/it/publish-scm-skip/invoker.properties | 21 +++++
src/it/publish-scm-skip/pom.xml | 101 +++++++++++++++++++++
src/it/publish-scm-skip/setup.bsh | 25 +++++
.../java/org/apache/maven/it/ThisHasJavadoc.java | 34 +++++++
src/it/publish-scm-skip/src/site/apt/index.apt | 20 ++++
.../src/site/resources/trunk/readme.txt | 2 +
src/it/publish-scm-skip/src/site/site.xml | 34 +++++++
src/it/publish-scm-skip/verify.bsh | 24 +++++
.../plugins/scmpublish/AbstractScmPublishMojo.java | 13 ++-
17 files changed, 533 insertions(+), 2 deletions(-)
diff --git a/src/it/issue-mscmpub-50/invoker.properties b/src/it/issue-mscmpub-50/invoker.properties
new file mode 100644
index 0000000..eaa8afa
--- /dev/null
+++ b/src/it/issue-mscmpub-50/invoker.properties
@@ -0,0 +1,21 @@
+# 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.
+
+invoker.goals = site scm-publish:publish-scm
+
+# Windows doesn't have svn and svnadmin executables
+invoker.os.family = !windows
diff --git a/src/it/issue-mscmpub-50/pom.xml b/src/it/issue-mscmpub-50/pom.xml
new file mode 100644
index 0000000..e6d27dc
--- /dev/null
+++ b/src/it/issue-mscmpub-50/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin-006-issue-mscmpub-50</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>publish-scm site (without staging)</name>
+ <url>http://people.apache.org/~bimargulies/site-test</url>
+
+ <distributionManagement>
+ <site>
+ <id>publish-scm-002</id>
+ <url>scm:svn:${project.baseUri}/target/svn-root</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content><!-- don't require site:stage -->
+ <skipDeployement>true</skipDeployement>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>ln</id>
+ <phase>site</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <symlink link="${project.reporting.outputDirectory}/link" resource="target/link" />
+ <symlink link="${project.reporting.outputDirectory}/link-directory" resource="apidocs" />
+ <symlink link="${project.reporting.outputDirectory}/link-file" resource="mail-lists.html" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/src/it/issue-mscmpub-50/setup.bsh b/src/it/issue-mscmpub-50/setup.bsh
new file mode 100644
index 0000000..14bb63e
--- /dev/null
+++ b/src/it/issue-mscmpub-50/setup.bsh
@@ -0,0 +1,25 @@
+/*
+ * 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 java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
diff --git a/src/it/issue-mscmpub-50/src/main/java/org/apache/maven/it/ThisHasJavadoc.java b/src/it/issue-mscmpub-50/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
new file mode 100644
index 0000000..dcd2936
--- /dev/null
+++ b/src/it/issue-mscmpub-50/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
@@ -0,0 +1,34 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * This is a class with some javadoc.
+ **/
+public class ThisHasJavadoc
+{
+ /**
+ * This is the constructor.
+ */
+ public ThisHasJavadoc()
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/src/it/issue-mscmpub-50/src/site/apt/index.apt b/src/it/issue-mscmpub-50/src/site/apt/index.apt
new file mode 100644
index 0000000..3f7ac17
--- /dev/null
+++ b/src/it/issue-mscmpub-50/src/site/apt/index.apt
@@ -0,0 +1,20 @@
+~~ 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.
+
+Index
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ultrices magna quis arcu venenatis varius. Donec pellentesque fringilla mauris, eget convallis quam gravida nec. Sed sapien urna, dapibus sed fringilla nec, adipiscing vitae dui. Sed at vestibulum diam. Integer mattis, eros in congue imperdiet, enim sapien eleifend mauris, sit amet blandit turpis nibh quis lorem. Donec consectetur hendrerit velit. Nulla luctus, felis eget luctus pharetra, sem lectus dapibus ante, eget so [...]
\ No newline at end of file
diff --git a/src/it/issue-mscmpub-50/src/site/resources/trunk/readme.txt b/src/it/issue-mscmpub-50/src/site/resources/trunk/readme.txt
new file mode 100644
index 0000000..5611999
--- /dev/null
+++ b/src/it/issue-mscmpub-50/src/site/resources/trunk/readme.txt
@@ -0,0 +1,2 @@
+This file content is not the same as reference svn.
+Will check svn checkin.
diff --git a/src/it/issue-mscmpub-50/src/site/site.xml b/src/it/issue-mscmpub-50/src/site/site.xml
new file mode 100644
index 0000000..d76d0fb
--- /dev/null
+++ b/src/it/issue-mscmpub-50/src/site/site.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+ name="perform-002">
+ <publishDate position="right"/>
+ <version position="left"/>
+ <body>
+ <menu name="perform-002">
+ <item name="Home" href="index.html" />
+ <item name="Javadoc" href="/apidocs/index.html" />
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>
diff --git a/src/it/issue-mscmpub-50/verify.bsh b/src/it/issue-mscmpub-50/verify.bsh
new file mode 100644
index 0000000..383f499
--- /dev/null
+++ b/src/it/issue-mscmpub-50/verify.bsh
@@ -0,0 +1,24 @@
+/*
+ * 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 java.nio.file.Files;
+
+File checkout = new File( basedir, "target/scmpublish-checkout" );
+
+return !checkout.exists();
diff --git a/src/it/publish-scm-skip/invoker.properties b/src/it/publish-scm-skip/invoker.properties
new file mode 100644
index 0000000..eaa8afa
--- /dev/null
+++ b/src/it/publish-scm-skip/invoker.properties
@@ -0,0 +1,21 @@
+# 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.
+
+invoker.goals = site scm-publish:publish-scm
+
+# Windows doesn't have svn and svnadmin executables
+invoker.os.family = !windows
diff --git a/src/it/publish-scm-skip/pom.xml b/src/it/publish-scm-skip/pom.xml
new file mode 100644
index 0000000..6620d64
--- /dev/null
+++ b/src/it/publish-scm-skip/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin-007-publish-scm-skip</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>publish-scm site (without staging)</name>
+ <url>http://people.apache.org/~bimargulies/site-test</url>
+
+ <distributionManagement>
+ <site>
+ <id>publish-scm-002</id>
+ <url>scm:svn:${project.baseUri}/target/svn-root</url>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content><!-- don't require site:stage -->
+ <skipDeployment>true</skipDeployment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>ln</id>
+ <phase>site</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <symlink link="${project.reporting.outputDirectory}/link" resource="target/link" />
+ <symlink link="${project.reporting.outputDirectory}/link-directory" resource="apidocs" />
+ <symlink link="${project.reporting.outputDirectory}/link-file" resource="mail-lists.html" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
diff --git a/src/it/publish-scm-skip/setup.bsh b/src/it/publish-scm-skip/setup.bsh
new file mode 100644
index 0000000..14bb63e
--- /dev/null
+++ b/src/it/publish-scm-skip/setup.bsh
@@ -0,0 +1,25 @@
+/*
+ * 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 java.io.*;
+import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
+
+SvnScmTestUtils.initializeRepository( new File( basedir, "target/svn-root" ) );
+
+return true;
\ No newline at end of file
diff --git a/src/it/publish-scm-skip/src/main/java/org/apache/maven/it/ThisHasJavadoc.java b/src/it/publish-scm-skip/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
new file mode 100644
index 0000000..dcd2936
--- /dev/null
+++ b/src/it/publish-scm-skip/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
@@ -0,0 +1,34 @@
+package org.apache.maven.it;
+
+/*
+ * 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.
+ */
+
+/**
+ * This is a class with some javadoc.
+ **/
+public class ThisHasJavadoc
+{
+ /**
+ * This is the constructor.
+ */
+ public ThisHasJavadoc()
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/src/it/publish-scm-skip/src/site/apt/index.apt b/src/it/publish-scm-skip/src/site/apt/index.apt
new file mode 100644
index 0000000..3f7ac17
--- /dev/null
+++ b/src/it/publish-scm-skip/src/site/apt/index.apt
@@ -0,0 +1,20 @@
+~~ 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.
+
+Index
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ultrices magna quis arcu venenatis varius. Donec pellentesque fringilla mauris, eget convallis quam gravida nec. Sed sapien urna, dapibus sed fringilla nec, adipiscing vitae dui. Sed at vestibulum diam. Integer mattis, eros in congue imperdiet, enim sapien eleifend mauris, sit amet blandit turpis nibh quis lorem. Donec consectetur hendrerit velit. Nulla luctus, felis eget luctus pharetra, sem lectus dapibus ante, eget so [...]
\ No newline at end of file
diff --git a/src/it/publish-scm-skip/src/site/resources/trunk/readme.txt b/src/it/publish-scm-skip/src/site/resources/trunk/readme.txt
new file mode 100644
index 0000000..5611999
--- /dev/null
+++ b/src/it/publish-scm-skip/src/site/resources/trunk/readme.txt
@@ -0,0 +1,2 @@
+This file content is not the same as reference svn.
+Will check svn checkin.
diff --git a/src/it/publish-scm-skip/src/site/site.xml b/src/it/publish-scm-skip/src/site/site.xml
new file mode 100644
index 0000000..d76d0fb
--- /dev/null
+++ b/src/it/publish-scm-skip/src/site/site.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+ name="perform-002">
+ <publishDate position="right"/>
+ <version position="left"/>
+ <body>
+ <menu name="perform-002">
+ <item name="Home" href="index.html" />
+ <item name="Javadoc" href="/apidocs/index.html" />
+ </menu>
+ <menu ref="reports"/>
+ </body>
+</project>
diff --git a/src/it/publish-scm-skip/verify.bsh b/src/it/publish-scm-skip/verify.bsh
new file mode 100644
index 0000000..383f499
--- /dev/null
+++ b/src/it/publish-scm-skip/verify.bsh
@@ -0,0 +1,24 @@
+/*
+ * 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 java.nio.file.Files;
+
+File checkout = new File( basedir, "target/scmpublish-checkout" );
+
+return !checkout.exists();
diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index 9ee3f70..ee343e7 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -118,10 +118,19 @@ public abstract class AbstractScmPublishMojo
/**
* Set this to 'true' to skip site deployment.
+ *
+ * @deprecated Please use {@link #skipDeployment}.
*/
- @Parameter ( property = "scmpublish.skipDeploy", alias = "maven.site.deploy.skip", defaultValue = "false" )
+ @Deprecated
+ @Parameter ( defaultValue = "false" )
private boolean skipDeployement;
+ /**
+ * Set this to 'true' to skip site deployment.
+ */
+ @Parameter ( property = "scmpublish.skipDeploy", alias = "maven.site.deploy.skip", defaultValue = "false" )
+ private boolean skipDeployment;
+
/**
* Run add and delete commands, but leave the actually checkin for the user to run manually.
*/
@@ -556,7 +565,7 @@ public abstract class AbstractScmPublishMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( skipDeployement )
+ if ( skipDeployment || skipDeployement )
{
getLog().info( "scmpublish.skipDeploy = true: Skipping site deployment" );
return;