You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/06/03 11:25:12 UTC

[jackrabbit-filevault-package-maven-plugin] branch feature/migrate-to-git updated (a3a417e -> 77fe70a)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch feature/migrate-to-git
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git.


 discard a3a417e  JCRVLT-398 migrate to git
     new 77fe70a  JCRVLT-398 migrate to git

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a3a417e)
            \
             N -- N -- N   refs/heads/feature/migrate-to-git (77fe70a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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.


Summary of changes:
 pom.xml                            | 104 ++++++++++++++++---------------------
 src/site/markdown/dev.md           |   2 +-
 src/site/markdown/howto_release.md |  15 +++---
 3 files changed, 52 insertions(+), 69 deletions(-)


[jackrabbit-filevault-package-maven-plugin] 01/01: JCRVLT-398 migrate to git

Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch feature/migrate-to-git
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git

commit 77fe70a019e40ef64edca5eaf58bf87e295e9ce3
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jun 2 14:15:22 2020 +0200

    JCRVLT-398 migrate to git
---
 README.md                          |  13 +----
 pom.xml                            | 114 +++++++++++++++++--------------------
 src/site/README.md                 |   1 +
 src/site/markdown/dev.md           |  37 +++---------
 src/site/markdown/howto_release.md |  23 ++++----
 src/site/site.xml                  |   2 +
 6 files changed, 77 insertions(+), 113 deletions(-)

diff --git a/README.md b/README.md
index 87d131b..7567bf4 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 Welcome to Apache Jackrabbit FileVault Package Maven Plugin
 ===========================================================
 
-The Apache Jackrabbit FileVault package maven plugin is an Apache Maven Plugin 
+The Apache Jackrabbit FileVault Package Maven Plugin is an Apache Maven Plugin 
 that simplifies the creation of content package Maven artifacts. The content 
 packages can later be used to install content into a JCR repository using the 
 Apache Jackrabbit FileVault packaging runtime.
@@ -62,17 +62,10 @@ Jackrabbit mailing lists as well as links to list archives, please see:
 Latest development
 ==================
 
-The latest FileVault package plugin source code is available via Subversion at
+The latest FileVault package plugin source code is available at
 
-   https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk/
+   <https://github.com/apache/jackrabbit-filevault-package-maven-plugin>
 
-or with ViewVC at
-
-   https://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/
-
-To checkout the main source tree, run
-
-   svn checkout https://svn.apache.org/repos/asf/commons/filevault-package-maven-plugin/trunk filevault-package-maven-plugin
 
 Credits
 =======
diff --git a/pom.xml b/pom.xml
index 9eff1e7..b0f1e12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>21</version>
+        <version>23</version>
         <relativePath />
     </parent>
 
@@ -46,29 +46,29 @@
         <jackrabbit.version>2.20.0</jackrabbit.version>
         <oak.version>1.20.0</oak.version>
         <filevault.version>3.4.5-SNAPSHOT</filevault.version>
+        <surefire.version>2.22.2</surefire.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.outputTimestamp>2020-01-22T15:10:38Z</project.build.outputTimestamp>
     </properties>
 
     <prerequisites>
         <maven>${maven.version}</maven>
     </prerequisites>
 
+    <!-- ====================================================================== -->
+    <!-- S C M  D E F I N I T I O N                                             -->
+    <!-- ====================================================================== -->
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk</url>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven.git</developerConnection>
+        <url>https://github.com/apache/jackrabbit-filevault-package-maven-plugin/tree/${project.scm.tag}</url>
+        <tag>trunk</tag>
     </scm>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  I N F O                                                 -->
     <!-- ====================================================================== -->
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
     <mailingLists>
         <mailingList>
             <name>Jackrabbit Developer List</name>
@@ -101,16 +101,53 @@
     <!-- B U I L D   D E F I N I T I O N                                        -->
     <!-- ====================================================================== -->
     <build>
+        <pluginManagement>
+            <plugin>
+                <artifactId>maven-plugin-plugin</artifactId>
+                <version>3.6.0</version>
+            </plugin>
+            <plugins>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.9.0</version>
+            </plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-plugin-plugin</artifactId>
+                                        <versionRange>[3.6.0,)</versionRange>
+                                        <goals>
+                                            <goal>descriptor</goal>
+                                            <goal>helpmojo</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+        </pluginManagement>
         <plugins>
             <!-- ====================================================================== -->
             <!-- C O M P I L E R   P L U G I N                                          -->
             <!-- ====================================================================== -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
                     <debug>true</debug>
                     <showDeprecation>false</showDeprecation>
                     <showWarnings>true</showWarnings>
@@ -121,9 +158,7 @@
             <!-- M A V E N   P L U G I N                                                -->
             <!-- ====================================================================== -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <id>default-descriptor</id>
@@ -142,7 +177,6 @@
             <!-- I N S T A L L   P L U G I N                                            -->
             <!-- ====================================================================== -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <executions>
                     <execution>
@@ -161,9 +195,7 @@
             <!-- F A I L S A F E   P L U G I N                                          -->
             <!-- ====================================================================== -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -182,9 +214,7 @@
             <!-- S U R E F I R E   P L U G I N                                          -->
             <!-- ====================================================================== -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
                 <configuration>
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
@@ -195,7 +225,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.9.0</version>
                 <configuration>
                     <generateReports>true</generateReports>
                     <relativizeDecorationLinks>false</relativizeDecorationLinks>
@@ -207,11 +236,6 @@
                         <artifactId>doxia-module-markdown</artifactId>
                         <version>1.9.1</version>
                     </dependency>
-                    <dependency>
-                        <groupId>org.apache.maven.skins</groupId>
-                        <artifactId>maven-fluido-skin</artifactId>
-                        <version>1.8</version>
-                    </dependency>
                 </dependencies>
             </plugin>
             <!-- ====================================================================== -->
@@ -259,36 +283,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-plugin-plugin</artifactId>
-                                        <versionRange>[3.6.0,)</versionRange>
-                                        <goals>
-                                            <goal>descriptor</goal>
-                                            <goal>helpmojo</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <!-- ====================================================================== -->
@@ -297,14 +291,10 @@
     <reporting>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.0.0</version>
                 <configuration>
                     <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
diff --git a/src/site/README.md b/src/site/README.md
index 753dc5f..c608b37 100644
--- a/src/site/README.md
+++ b/src/site/README.md
@@ -46,6 +46,7 @@ Note: Every committer should be able to deploy the site. No fiddling with
 credentials needed since deployment is done via svn commit to
 `https://svn.apache.org/repos/asf/jackrabbit/site/live/filevault-package-maven-plugin`.
 
+
 Update Documentation After Release
 ==================================
 
diff --git a/src/site/markdown/dev.md b/src/site/markdown/dev.md
index 5254e89..6a8449c 100644
--- a/src/site/markdown/dev.md
+++ b/src/site/markdown/dev.md
@@ -20,51 +20,32 @@ Developing
 
 Latest development
 ------------------
-The latest FileVault Package Maven Plugin source code is available via Subversion at
+The latest FileVault Package Maven Plugin source code is available at
 
-* https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk
-
-or with ViewVC at
-
-* https://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk
-
-or on GitHub at
-
-* https://github.com/apache/jackrabbit-filevault-package-maven-plugin
-
-
-To checkout the main Jackrabbit source tree, run
-
-    svn checkout https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk jackrabbit-filevault
-    
-or
-
-    git clone https://github.com/apache/jackrabbit-filevault-package-maven-plugin.git
+   <https://github.com/apache/jackrabbit-filevault-package-maven-plugin>
 
 
 Building FileVault Package Maven Plugin
 ------------------
-You can build FileVault Package Maven Plugin using maven:
+You can build FileVault Package Maven Plugin using Maven:
 
-    cd filevault-package-maven-plugin
+    cd jackrabbit-filevault-package-maven-plugin
     mvn clean install
 
-You need Maven 3.2.5 (or higher) with Java 7 (or higher) for the build.
-For more instructions, please see the documentation at:
-
-*  http://jackrabbit.apache.org/building-jackrabbit.html
+You need Maven 3.3.9 (or higher) with Java 8 (or higher) for the build.
+For more instructions, please see the documentation at <https://jackrabbit.apache.org/building-jackrabbit.html>
 
 Issue Tracker
 -------------
 Apache Jackrabbit FileVault uses Jira for tracking bug reports and requests for improvements, new features, 
 and other changes.
 
-The issue tracker is available at https://issues.apache.org/jira/browse/JCRVLT and is readable by everyone. 
+The issue tracker is available at <https://issues.apache.org/jira/browse/JCRVLT> and is readable by everyone. 
 A Jira account is needed to create new issues and to comment on existing issues. Use the
 [registration form](https://issues.apache.org/jira/secure/Signup!default.jspa) to request an account if you 
 do not already have one.
 
-See the [Jackrabbit Issue Tracker Page](http://jackrabbit.apache.org/issue-tracker.html) for more information.
+See the [Jackrabbit Issue Tracker Page](https://jackrabbit.apache.org/issue-tracker.html) for more information.
 
 
 Mailing Lists
@@ -73,7 +54,7 @@ To get involved with the Apache Jackrabbit project, start by having a
 look at our website and joining our mailing lists. For more details about
 Jackrabbit mailing lists as well as links to list archives, please see:
 
-* http://jackrabbit.apache.org/mailing-lists.html
+* https://jackrabbit.apache.org/mailing-lists.html
 
 Releasing
 ---------
diff --git a/src/site/markdown/howto_release.md b/src/site/markdown/howto_release.md
index a603a7c..2a21f0b 100644
--- a/src/site/markdown/howto_release.md
+++ b/src/site/markdown/howto_release.md
@@ -63,7 +63,7 @@ Release management tasks
 4. Close the [staged repository][2] on _repository.apache.org_.  
    Use `Apache Jackrabbit Filevault Package Maven Plugin ${version} RC` as comment.
    
-5. Upload the artifacts to https://dist.apache.org/repos/dist/dev/jackrabbit/filevault via SVN
+5. Upload the artifacts to https://dist.apache.org/repos/dist/dev/jackrabbit/filevault-package-maven-plugin via SVN
        
         svn co https://dist.apache.org/repos/dist/dev/jackrabbit/filevault-package-maven-plugin dist-dev-filevault-plugin
         cd dist-dev-filevault-plugin
@@ -74,10 +74,7 @@ Release management tasks
 6. Start the vote thread, wait **72 hours**. See the `vote.txt` template generated by the Maven build.
 
 7. If the vote fails (easy case first):
-    1. remove the release tag from svn
-        ````
-        svn rm https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/tags/filevault-package-maven-plugin-$version
-        ````
+    1. remove the release tag from Git
     2. delete the RC from _dist.apache.org_
         ````
         svn rm https://dist.apache.org/repos/dist/dev/jackrabbit/filevault-package-maven-plugin/$version
@@ -120,10 +117,10 @@ Release management tasks
 
 Related Links
 -------------
-* http://www.apache.org/dev/release.html
-* http://www.apache.org/dev/release-signing.html
-* http://wiki.apache.org/incubator/SigningReleases
-* http://www.apache.org/dev/repository-faq.html
+* https://www.apache.org/dev/release.html
+* https://www.apache.org/dev/release-signing.html
+* https://wiki.apache.org/incubator/SigningReleases
+* https://www.apache.org/dev/repository-faq.html
 
   
 <a name="A"></a>
@@ -161,15 +158,15 @@ Appendix B: Maven settings
         <!-- To deploy a Jackrabbit snapshot -->
         <server>
           <id>apache.snapshots.https</id>
-          <username> <!-- YOUR APACHE SVN USERNAME --> </username>
-          <password> <!-- YOUR APACHE SVN PASSWORD --> </password>
+          <username> <!-- YOUR APACHE LDAP USERNAME --> </username>
+          <password> <!-- YOUR APACHE LDAP PASSWORD --> </password>
         </server>
         
         <!-- To stage a Jackrabbit release -->
         <server>
           <id>apache.releases.https</id>
-          <username> <!-- YOUR APACHE SVN USERNAME --> </username>
-          <password> <!-- YOUR APACHE SVN PASSWORD --> </password>
+          <username> <!-- YOUR APACHE LDAP USERNAME --> </username>
+          <password> <!-- YOUR APACHE LDAP PASSWORD --> </password>
         </server>
         
         <!-- used for gpg code signing key -->
diff --git a/src/site/site.xml b/src/site/site.xml
index b201a3f..4ede4c5 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,6 +20,8 @@
 <project xmlns="http://maven.apache.org/DECORATION/1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"
     name="Jackrabbit FileVault Package Maven Plugin">
+    
+    <edit>${project.scm.url}</edit>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>