You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/05/23 16:47:51 UTC
[maven-scm-publish-plugin] branch master updated: [MSCMPUB-46] drop
custom scmpublish lifecycle and goal
This is an automated email from the ASF dual-hosted git repository.
hboutemy 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 fe751af [MSCMPUB-46] drop custom scmpublish lifecycle and goal
fe751af is described below
commit fe751aff5d15b02bf80078d4c1e834c57f4d549b
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat May 23 18:47:46 2020 +0200
[MSCMPUB-46] drop custom scmpublish lifecycle and goal
---
pom.xml | 12 ---
src/it/003-lifecycle/invoker.properties | 21 ----
src/it/003-lifecycle/pom.xml | 95 -----------------
src/it/003-lifecycle/setup.bsh | 25 -----
.../java/org/apache/maven/it/ThisHasJavadoc.java | 34 ------
src/it/003-lifecycle/src/site/apt/index.apt | 20 ----
src/it/003-lifecycle/src/site/site.xml | 34 ------
src/it/006-site-multi-module/invoker.properties | 21 ----
src/it/006-site-multi-module/module/pom.xml | 32 ------
.../java/org/apache/maven/it/ThisHasJavadoc.java | 34 ------
src/it/006-site-multi-module/pom.xml | 114 --------------------
src/it/006-site-multi-module/setup.bsh | 25 -----
src/it/job_@2/invoker.properties | 18 ----
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 ------
.../scmpublish/ScmPublishLifecycleMojo.java | 44 --------
src/main/resources/META-INF/maven/lifecycle.xml | 41 --------
src/main/resources/META-INF/plexus/components.xml | 72 -------------
src/site/apt/usage.apt.vm | 116 ---------------------
23 files changed, 982 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa7a327..72d8c00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,15 +166,6 @@ under the License.
<version>4.11</version>
</dependency>
</dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
<profiles>
<profile>
@@ -186,9 +177,6 @@ under the License.
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<addTestClassPath>true</addTestClassPath>
- <pomExcludes>
- <pomExclude>00*/pom.xml</pomExclude>
- </pomExcludes>
</configuration>
</plugin>
</plugins>
diff --git a/src/it/003-lifecycle/invoker.properties b/src/it/003-lifecycle/invoker.properties
deleted file mode 100644
index 5776bb9..0000000
--- a/src/it/003-lifecycle/invoker.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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 = scm-publish:scmpublish
-
-# at the moment, this IT does not work
-invoker.failureBehavior = fail-never
\ No newline at end of file
diff --git a/src/it/003-lifecycle/pom.xml b/src/it/003-lifecycle/pom.xml
deleted file mode 100644
index 4c03a4d..0000000
--- a/src/it/003-lifecycle/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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-003-lifecycle</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <name> maven-scm-publish-plugin-003-lifecycle</name>
- <description>Test scm-publish using custom lifecycle (as introduced by scmpublish goal)</description>
- <url>http://people.apache.org/~bimargulies/site-test</url>
-
- <distributionManagement>
- <site>
- <id>perform-002</id>
- <url>file:target/dummy</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>
- <extensions>true</extensions>
- <configuration>
- <pubScmUrl>scm:svn:${project.baseUri}/target/svn-root</pubScmUrl>
- <providerImplementations>
- <svn>javasvn</svn>
- </providerImplementations>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
- <artifactId>maven-scm-provider-svnjava</artifactId>
- <version>1.15</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- </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/003-lifecycle/setup.bsh b/src/it/003-lifecycle/setup.bsh
deleted file mode 100644
index 14bb63e..0000000
--- a/src/it/003-lifecycle/setup.bsh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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/003-lifecycle/src/main/java/org/apache/maven/it/ThisHasJavadoc.java b/src/it/003-lifecycle/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
deleted file mode 100644
index dcd2936..0000000
--- a/src/it/003-lifecycle/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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/003-lifecycle/src/site/apt/index.apt b/src/it/003-lifecycle/src/site/apt/index.apt
deleted file mode 100644
index 3f7ac17..0000000
--- a/src/it/003-lifecycle/src/site/apt/index.apt
+++ /dev/null
@@ -1,20 +0,0 @@
-~~ 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/003-lifecycle/src/site/site.xml b/src/it/003-lifecycle/src/site/site.xml
deleted file mode 100644
index d76d0fb..0000000
--- a/src/it/003-lifecycle/src/site/site.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/006-site-multi-module/invoker.properties b/src/it/006-site-multi-module/invoker.properties
deleted file mode 100644
index 98a233c..0000000
--- a/src/it/006-site-multi-module/invoker.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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-deploy
-
-# at the moment, this IT does not work
-invoker.failureBehavior = fail-never
diff --git a/src/it/006-site-multi-module/module/pom.xml b/src/it/006-site-multi-module/module/pom.xml
deleted file mode 100644
index 30319d6..0000000
--- a/src/it/006-site-multi-module/module/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>
-
- <parent>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin-006-site-multi-module</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>module</artifactId>
-
- <name>maven-scm-publish-plugin-006-site-multi-module child module</name>
-</project>
diff --git a/src/it/006-site-multi-module/module/src/main/java/org/apache/maven/it/ThisHasJavadoc.java b/src/it/006-site-multi-module/module/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
deleted file mode 100644
index dcd2936..0000000
--- a/src/it/006-site-multi-module/module/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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/006-site-multi-module/pom.xml b/src/it/006-site-multi-module/pom.xml
deleted file mode 100644
index 042c07f..0000000
--- a/src/it/006-site-multi-module/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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-site-multi-module</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>maven-scm-publish-plugin-006-site-multi-module</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>
-
- <modules>
- <module>module</module>
- </modules>
-
- <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/006-site-multi-module/setup.bsh b/src/it/006-site-multi-module/setup.bsh
deleted file mode 100644
index 14bb63e..0000000
--- a/src/it/006-site-multi-module/setup.bsh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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/invoker.properties b/src/it/job_@2/invoker.properties
deleted file mode 100644
index 270bcc7..0000000
--- a/src/it/job_@2/invoker.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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-deploy
diff --git a/src/it/job_@2/pom.xml b/src/it/job_@2/pom.xml
deleted file mode 100644
index 130cf11..0000000
--- a/src/it/job_@2/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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>3.1.0</version>
- <configuration>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
diff --git a/src/it/job_@2/setup.bsh b/src/it/job_@2/setup.bsh
deleted file mode 100644
index 14bb63e..0000000
--- a/src/it/job_@2/setup.bsh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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
deleted file mode 100644
index dcd2936..0000000
--- a/src/it/job_@2/src/main/java/org/apache/maven/it/ThisHasJavadoc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 3f7ac17..0000000
--- a/src/it/job_@2/src/site/apt/index.apt
+++ /dev/null
@@ -1,20 +0,0 @@
-~~ 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
deleted file mode 100644
index 5611999..0000000
--- a/src/it/job_@2/src/site/resources/trunk/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d76d0fb..0000000
--- a/src/it/job_@2/src/site/site.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java
deleted file mode 100644
index d020185..0000000
--- a/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishLifecycleMojo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.plugins.scmpublish;
-
-/*
- * 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.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-
-/**
- * Empty goal, provided only to set loose the lifecycle.
- *
- * @goal scmpublish
- * @execute lifecycle="scmpublish" phase="scmpublish-publish"
- * @aggregator
- */
-public class ScmPublishLifecycleMojo
- extends AbstractMojo
-{
-
- @Override
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- // nothing to do.
- }
-
-}
diff --git a/src/main/resources/META-INF/maven/lifecycle.xml b/src/main/resources/META-INF/maven/lifecycle.xml
deleted file mode 100644
index 6e70787..0000000
--- a/src/main/resources/META-INF/maven/lifecycle.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0'?>
-<!--
- 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.
--->
-<lifecycles>
- <lifecycle>
- <id>scmpublish</id>
- <phases>
- <phase>
- <id>scmpublish-prepare</id>
- </phase>
- <phase>
- <id>scmpublish-pre-site</id>
- </phase>
- <phase>
- <id>scmpublish-site</id>
- </phase>
- <phase>
- <id>scmpublish-post-site</id>
- </phase>
- <phase>
- <id>scmpublish-publish</id>
- </phase>
- </phases>
- </lifecycle>
-</lifecycles>
\ No newline at end of file
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 8ee7b7b..0000000
--- a/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>scmpublish</role-hint>
- <implementation>
- org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
- </implementation>
- <configuration>
- <phases>
- <scmpublish-prepare>
- </scmpublish-prepare>
- <scmpublish-site>
- org.apache.maven.plugins:maven-site-plugin:3.3:site
- </scmpublish-site>
- <scmpublish-post-site>
- org.apache.maven.plugins:maven-site-plugin:3.3:stage
- </scmpublish-post-site>
- <scmpublish-publish>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish-scm
- </scmpublish-publish>
- </phases>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.lifecycle.Lifecycle</role>
- <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
- <role-hint>scmpublish</role-hint>
- <configuration>
- <id>scmpublish</id>
- <phases>
- <phase>scmpublish-prepare</phase>
- <phase>scmpublish-site</phase>
- <phase>scmpublish-post-site</phase>
- <phase>scmpublish-publish</phase>
- </phases>
- <default-phases>
- <scmpublish-prepare>
- </scmpublish-prepare>
- <scmpublish-site>
- org.apache.maven.plugins:maven-site-plugin:3.3:site
- </scmpublish-site>
- <scmpublish-post-site>
- org.apache.maven.plugins:maven-site-plugin:3.3:stage
- </scmpublish-post-site>
- <scmpublish-publish>
- org.apache.maven.plugins:maven-site-scm-publish-plugin:${project.version}:publish-scm
- </scmpublish-publish>
- </default-phases>
- </configuration>
- </component>
- </components>
-</component-set>
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 941149c..115ad6e 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -39,119 +39,3 @@ mvn scm-publish:publish-scm
+-----------+
which will work both for multi-and mono-modules sites.
-
-* Usage With Lifecycle (beta)
-
- There are two ways you can set this up for site in your POM.
-
-** Use the Custom Lifecycle
-
- Unfortunately, a Maven plugin can't define a top-level lifecycle
- like 'site'. However, it can come close. The plugin includes the
- <scmpublish> goal. This goal does nothing except fork a custom
- <scmpublish> lifecycle, consisting of the following phases:
-
- * <<<scmpublish-prepare>>>
-
- * <<<scmpublish-pre-site>>>
-
- * <<<scmpublish-site>>>
-
- * <<<scmpublish-post-site>>>
-
- * <<<scmpublish-publish>>>
-
- []
-
- (Again unfortunately, Maven does not allow a custom lifecycle to share
- phases with some other lifecycle.)
-
- With a little configuration in your POM,
-
-+---------+
- mvn scm-publish:scmpublish
-+---------+
-
- will do all the work.
-
-+------+
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>${project.version}</version>
- <extensions>true</extensions>
- <configuration>
- <!-- svn location for publication -->
- <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test-003</pubScmUrl>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-+------+
-
- <Notice>: this is actually not working, the 003-lifecycle IT has been disabled.
-
-
-** Using the Site Lifecycle
-
- The alternative is to attach the necessary activities to the site lifecycle and deactivate
- maven-site-plugin's site deploy goal. This requires more XML in the POM, but it may be easier
- to use if you already customize the site lifecycle for other reasons.
-
-+-----+
- <distributionManagement>
- <site>
- <id>site</id>
- <url>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/bimargulies/site-test</url>
- </site>
- </distributionManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </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>
-+-----+