You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/06/16 18:54:40 UTC
(maven-scm-publish-plugin) branch next-version created (now 19adf63)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch next-version
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
at 19adf63 [MSCMPUB-69] ITs do not properly check for existence of svn/svnadmin/CreateSymbolicLink command/function
This branch includes the following new commits:
new f0d13f8 [MSCMPUB-67] Upgrade to Maven 3.6.3
new 1b4a3ed [MSCMPUB-68] Upgrade plugins and components (in ITs)
new 19adf63 [MSCMPUB-69] ITs do not properly check for existence of svn/svnadmin/CreateSymbolicLink command/function
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-scm-publish-plugin) 01/03: [MSCMPUB-67] Upgrade to Maven 3.6.3
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch next-version
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit f0d13f8ff5cc5d409b629875f1c86f2525dfee6d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 15 22:58:05 2024 +0200
[MSCMPUB-67] Upgrade to Maven 3.6.3
---
pom.xml | 16 ++++++----------
src/site/apt/various-tips.apt.vm | 30 ------------------------------
2 files changed, 6 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index 781ac9f..5bb8a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@ under the License.
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git</developerConnection>
- <tag>maven-scm-publish-plugin-3.2.1</tag>
+ <tag>HEAD</tag>
<url>https://github.com/apache/maven-scm-publish-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -65,18 +65,14 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
<javaVersion>8</javaVersion>
- <scmVersion>2.0.0</scmVersion>
- <releasePluginVersion>3.0.1</releasePluginVersion>
+ <mavenVersion>3.6.3</mavenVersion>
+ <scmVersion>2.1.0</scmVersion>
+ <releasePluginVersion>3.1.0</releasePluginVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<antrunPluginVersion>3.1.0</antrunPluginVersion>
- <projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
- <javadocPluginVersion>3.5.0</javadocPluginVersion>
-
- <!-- for documentation purpose -->
- <maven-scm-provider-svnjava-version>2.0.6</maven-scm-provider-svnjava-version>
- <svnkit-version>1.7.11</svnkit-version>
+ <projectInfoReportsPluginVersion>3.6.0</projectInfoReportsPluginVersion>
+ <javadocPluginVersion>3.7.0</javadocPluginVersion>
<project.build.outputTimestamp>2023-03-26T17:41:30Z</project.build.outputTimestamp>
</properties>
diff --git a/src/site/apt/various-tips.apt.vm b/src/site/apt/various-tips.apt.vm
index 8c22549..72510fa 100644
--- a/src/site/apt/various-tips.apt.vm
+++ b/src/site/apt/various-tips.apt.vm
@@ -123,33 +123,3 @@ Various tips for using this plugin
</configuration>
</plugin>
+----------------+
-
-
-* Using alternate scm provider
-
- You can use svnjava rather than default svn cli if you use a machine without svn cli.
-
-+----------------+
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>${maven-scm-provider-svnjava-version}</version>
- </dependency>
- <dependency>
- <groupId>org.tmatesoft.svnkit</groupId>
- <artifactId>svnkit</artifactId>
- <version>${svnkit-version}</version>
- </dependency>
- </dependencies>
- </plugin>
-+----------------+
(maven-scm-publish-plugin) 02/03: [MSCMPUB-68] Upgrade plugins and components (in ITs)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch next-version
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit 1b4a3ed7969cfdd1e00b02a9e09bfd4e3953534f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 15 22:59:48 2024 +0200
[MSCMPUB-68] Upgrade plugins and components (in ITs)
---
pom.xml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5bb8a08..8d16a31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,21 +119,16 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.4.1</version>
+ <version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xml</artifactId>
- </dependency>
- <!-- remove with maven-shared-utils upgrade -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.16.0</version>
+ <version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
(maven-scm-publish-plugin) 03/03: [MSCMPUB-69] ITs do not properly check for existence of svn/svnadmin/CreateSymbolicLink command/function
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch next-version
in repository https://gitbox.apache.org/repos/asf/maven-scm-publish-plugin.git
commit 19adf63b5cb8e6a532eb23a00a43ed8281d27c2f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 15 23:46:40 2024 +0200
[MSCMPUB-69] ITs do not properly check for existence of svn/svnadmin/CreateSymbolicLink command/function
---
src/it/issue-mscmpub-50/invoker.properties | 3 --
src/it/issue-mscmpub-50/selector.groovy | 42 ++++++++++++++++++++++++++
src/it/publish-scm-skip/invoker.properties | 3 --
src/it/publish-scm-skip/selector.groovy | 42 ++++++++++++++++++++++++++
src/it/publish-scm-staged/selector.groovy | 32 ++++++++++++++++++++
src/it/publish-scm/invoker.properties | 3 --
src/it/publish-scm/selector.groovy | 48 ++++++++++++++++++++++++++++++
src/it/site-deploy/selector.groovy | 32 ++++++++++++++++++++
8 files changed, 196 insertions(+), 9 deletions(-)
diff --git a/src/it/issue-mscmpub-50/invoker.properties b/src/it/issue-mscmpub-50/invoker.properties
index eaa8afa..bf59692 100644
--- a/src/it/issue-mscmpub-50/invoker.properties
+++ b/src/it/issue-mscmpub-50/invoker.properties
@@ -16,6 +16,3 @@
# 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/selector.groovy b/src/it/issue-mscmpub-50/selector.groovy
new file mode 100644
index 0000000..53e6e07
--- /dev/null
+++ b/src/it/issue-mscmpub-50/selector.groovy
@@ -0,0 +1,42 @@
+/*
+ * 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
+import java.nio.file.Path
+
+try {
+ def proc = "svnadmin".execute()
+ proc.consumeProcessOutput()
+ proc.waitFor()
+
+ def proc2 = "svn".execute()
+ proc2.consumeProcessOutput()
+ proc2.waitFor()
+
+ def pom = basedir.toPath().resolve("pom.xml")
+ def linkedPom = basedir.toPath().resolve("linked-pom.xml")
+ if (Files.exists(linkedPom)) {
+ Files.delete(linkedPom)
+ }
+ Files.createSymbolicLink(linkedPom, pom)
+} catch (IOException e) {
+ return false
+}
+
+return true
diff --git a/src/it/publish-scm-skip/invoker.properties b/src/it/publish-scm-skip/invoker.properties
index eaa8afa..bf59692 100644
--- a/src/it/publish-scm-skip/invoker.properties
+++ b/src/it/publish-scm-skip/invoker.properties
@@ -16,6 +16,3 @@
# 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/selector.groovy b/src/it/publish-scm-skip/selector.groovy
new file mode 100644
index 0000000..53e6e07
--- /dev/null
+++ b/src/it/publish-scm-skip/selector.groovy
@@ -0,0 +1,42 @@
+/*
+ * 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
+import java.nio.file.Path
+
+try {
+ def proc = "svnadmin".execute()
+ proc.consumeProcessOutput()
+ proc.waitFor()
+
+ def proc2 = "svn".execute()
+ proc2.consumeProcessOutput()
+ proc2.waitFor()
+
+ def pom = basedir.toPath().resolve("pom.xml")
+ def linkedPom = basedir.toPath().resolve("linked-pom.xml")
+ if (Files.exists(linkedPom)) {
+ Files.delete(linkedPom)
+ }
+ Files.createSymbolicLink(linkedPom, pom)
+} catch (IOException e) {
+ return false
+}
+
+return true
diff --git a/src/it/publish-scm-staged/selector.groovy b/src/it/publish-scm-staged/selector.groovy
new file mode 100644
index 0000000..ab83e41
--- /dev/null
+++ b/src/it/publish-scm-staged/selector.groovy
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+try {
+ def proc = "svnadmin".execute()
+ proc.consumeProcessOutput()
+ proc.waitFor()
+
+ def proc2 = "svn".execute()
+ proc2.consumeProcessOutput()
+ proc2.waitFor()
+} catch (IOException e) {
+ return false
+}
+
+return true
diff --git a/src/it/publish-scm/invoker.properties b/src/it/publish-scm/invoker.properties
index eaa8afa..bf59692 100644
--- a/src/it/publish-scm/invoker.properties
+++ b/src/it/publish-scm/invoker.properties
@@ -16,6 +16,3 @@
# 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/selector.groovy b/src/it/publish-scm/selector.groovy
new file mode 100644
index 0000000..2f1b480
--- /dev/null
+++ b/src/it/publish-scm/selector.groovy
@@ -0,0 +1,48 @@
+/*
+ * 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
+import java.nio.file.Path
+import java.util.Locale
+
+try {
+ def proc = "svnadmin".execute()
+ proc.consumeProcessOutput()
+ proc.waitFor()
+
+ def proc2 = "svn".execute()
+ proc2.consumeProcessOutput()
+ proc2.waitFor()
+
+ def pom = basedir.toPath().resolve("pom.xml")
+ def linkedPom = basedir.toPath().resolve("linked-pom.xml")
+ if (Files.exists(linkedPom)) {
+ Files.delete(linkedPom)
+ }
+ Files.createSymbolicLink(linkedPom, pom)
+} catch (IOException e) {
+ return false
+}
+
+// Because of a bug in Subversion on Windows
+if (System.properties['os.name'].toLowerCase(Locale.ROOT).contains('windows')) {
+ return false
+}
+
+return true
diff --git a/src/it/site-deploy/selector.groovy b/src/it/site-deploy/selector.groovy
new file mode 100644
index 0000000..ab83e41
--- /dev/null
+++ b/src/it/site-deploy/selector.groovy
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+try {
+ def proc = "svnadmin".execute()
+ proc.consumeProcessOutput()
+ proc.waitFor()
+
+ def proc2 = "svn".execute()
+ proc2.consumeProcessOutput()
+ proc2.waitFor()
+} catch (IOException e) {
+ return false
+}
+
+return true