maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject [maven-scm-publish-plugin] 01/03: [MSCMPUB-42] Can't publish to file:// URL containing an @
Date Mon, 22 Apr 2019 18:27:41 GMT
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSCMPUB-42
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git

commit bcb19f0df1ef7eab09c6f1bd89e61b39317fcad1
Author: rfscholte <rfscholte@apache.org>
AuthorDate: Sun Apr 21 15:10:37 2019 +0200

    [MSCMPUB-42] Can't publish to file:// URL containing an @
---
 pom.xml                                            |   2 +-
 src/it/{site-deploy => job_@2}/invoker.properties  |   3 -
 src/it/job_@2/pom.xml                              | 109 +++++++++++++++++++++
 src/it/job_@2/setup.bsh                            |  25 +++++
 .../java/org/apache/maven/it/ThisHasJavadoc.java   |  34 +++++++
 src/it/job_@2/src/site/apt/index.apt               |  20 ++++
 src/it/job_@2/src/site/resources/trunk/readme.txt  |   2 +
 src/it/job_@2/src/site/site.xml                    |  34 +++++++
 src/it/publish-scm-staged/invoker.properties       |   5 +-
 src/it/site-deploy/invoker.properties              |   5 +-
 10 files changed, 227 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index c49c414..3b32ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <scmVersion>1.10.0</scmVersion>
+    <scmVersion>1.11.2</scmVersion>
     <mavenVersion>3.0</mavenVersion>
     <javaVersion>7</javaVersion>
 
diff --git a/src/it/site-deploy/invoker.properties b/src/it/job_@2/invoker.properties
similarity index 90%
copy from src/it/site-deploy/invoker.properties
copy to src/it/job_@2/invoker.properties
index e9b4e5f..270bcc7 100644
--- a/src/it/site-deploy/invoker.properties
+++ b/src/it/job_@2/invoker.properties
@@ -16,6 +16,3 @@
 # under the License.
 
 invoker.goals = site-deploy
-
-# Windows doesn't have svn and svnadmin executables
-invoker.os.family = !windows
diff --git a/src/it/job_@2/pom.xml b/src/it/job_@2/pom.xml
new file mode 100644
index 0000000..b8d1a88
--- /dev/null
+++ b/src/it/job_@2/pom.xml
@@ -0,0 +1,109 @@
+<?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-005-site-lifecycle</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-scm-publish-plugin-004-005-site-lifecycle</name>
+  <url>http://people.apache.org/~bimargulies/site-test</url>
+
+  <distributionManagement>
+    <site>
+      <id>site-lifecycle</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>
+          <configuration>
+            <skipDeploy>true</skipDeploy>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-scm-publish-plugin</artifactId>
+          <version>@project.version@</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>stage-for-scm-publish</id>
+            <phase>post-site</phase>
+            <goals>
+              <goal>stage</goal>
+            </goals>
+            <configuration>
+              <skipDeploy>false</skipDeploy><!-- MSITE-652: configuration
won't be necessary with m-site-p 3.2 -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <id>scm-publish</id>
+            <phase>site-deploy</phase>
+            <goals>
+              <goal>publish-scm</goal>
+            </goals>
+          </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>2.8.1</version>
+        <configuration>
+        </configuration>
+      </plugin>
+      </plugins>
+  </reporting>
+</project>
diff --git a/src/it/job_@2/setup.bsh b/src/it/job_@2/setup.bsh
new file mode 100644
index 0000000..14bb63e
--- /dev/null
+++ b/src/it/job_@2/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/job_@2/src/main/java/org/apache/maven/it/ThisHasJavadoc.java b/src/it/job_@2/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
new file mode 100644
index 0000000..dcd2936
--- /dev/null
+++ b/src/it/job_@2/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/job_@2/src/site/apt/index.apt b/src/it/job_@2/src/site/apt/index.apt
new file mode 100644
index 0000000..3f7ac17
--- /dev/null
+++ b/src/it/job_@2/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/job_@2/src/site/resources/trunk/readme.txt b/src/it/job_@2/src/site/resources/trunk/readme.txt
new file mode 100644
index 0000000..5611999
--- /dev/null
+++ b/src/it/job_@2/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/job_@2/src/site/site.xml b/src/it/job_@2/src/site/site.xml
new file mode 100644
index 0000000..d76d0fb
--- /dev/null
+++ b/src/it/job_@2/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-staged/invoker.properties b/src/it/publish-scm-staged/invoker.properties
index 6af860f..2e0a83d 100644
--- a/src/it/publish-scm-staged/invoker.properties
+++ b/src/it/publish-scm-staged/invoker.properties
@@ -15,7 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = site site:stage scm-publish:publish-scm
-
-# Windows doesn't have svn and svnadmin executables
-invoker.os.family = !windows
+invoker.goals = site site:stage scm-publish:publish-scm
\ No newline at end of file
diff --git a/src/it/site-deploy/invoker.properties b/src/it/site-deploy/invoker.properties
index e9b4e5f..8e705b8 100644
--- a/src/it/site-deploy/invoker.properties
+++ b/src/it/site-deploy/invoker.properties
@@ -15,7 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = site-deploy
-
-# Windows doesn't have svn and svnadmin executables
-invoker.os.family = !windows
+invoker.goals = site-deploy
\ No newline at end of file


Mime
View raw message