sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1833905 - in /sis/site/trunk: book/README.txt content/DOAP.rdf content/branches.mdtext content/contributor.mdtext content/index.mdtext content/release-management-setup.mdtext content/release-management.mdtext
Date Wed, 20 Jun 2018 10:49:06 GMT
Author: desruisseaux
Date: Wed Jun 20 10:49:05 2018
New Revision: 1833905

URL: http://svn.apache.org/viewvc?rev=1833905&view=rev
Log:
Update more references to source code repository (migration from SVN to Git).

Modified:
    sis/site/trunk/book/README.txt
    sis/site/trunk/content/DOAP.rdf
    sis/site/trunk/content/branches.mdtext
    sis/site/trunk/content/contributor.mdtext
    sis/site/trunk/content/index.mdtext
    sis/site/trunk/content/release-management-setup.mdtext
    sis/site/trunk/content/release-management.mdtext

Modified: sis/site/trunk/book/README.txt
URL: http://svn.apache.org/viewvc/sis/site/trunk/book/README.txt?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/book/README.txt [UTF-8] (original)
+++ sis/site/trunk/book/README.txt [UTF-8] Wed Jun 20 10:49:05 2018
@@ -5,7 +5,7 @@ the 'org.apache.sis.internal.book.Assemb
 Assuming the following directory structure:
 
 (any directory)
-  ├─ trunk
+  ├─ master
   └─ site
       ├─ book
       └─ content
@@ -13,6 +13,6 @@ Assuming the following directory structu
 Then the command can be used as below on Unix systems:
 
 cd site
-java -classpath ../trunk/core/sis-build-helper/target/classes org.apache.sis.internal.book.Assembler
en
+java -classpath ../master/core/sis-build-helper/target/classes org.apache.sis.internal.book.Assembler
en
 
 Replace "en" by "fr" for generating the French version.

Modified: sis/site/trunk/content/DOAP.rdf
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/DOAP.rdf?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/DOAP.rdf (original)
+++ sis/site/trunk/content/DOAP.rdf Wed Jun 20 10:49:05 2018
@@ -40,15 +40,9 @@
     <mailing-list  rdf:resource = "http://sis.apache.org/mail-lists.html"/>
     <download-page rdf:resource = "http://sis.apache.org/downloads.html"/>
     <repository>
-      <SVNRepository>
-        <location rdf:resource = "http://svn.apache.org/repos/asf/sis/trunk"/>
-        <browse   rdf:resource = "http://svn.apache.org/viewvc/sis/trunk"/>
-      </SVNRepository>
-    </repository>
-    <repository>
       <GitRepository>
-        <location rdf:resource = "git://git.apache.org/sis.git"/>
-        <browse   rdf:resource = "http://github.com/apache/sis"/>
+        <location rdf:resource = "https://gitbox.apache.org/repos/asf/sis.git"/>
+        <browse   rdf:resource = "https://gitbox.apache.org/repos/asf?p=sis.git"/>
       </GitRepository>
     </repository>
     <asfext:implements>

Modified: sis/site/trunk/content/branches.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/branches.mdtext?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/branches.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/branches.mdtext [UTF-8] Wed Jun 20 10:49:05 2018
@@ -55,9 +55,9 @@ GeoAPI 3.1 branch    {#geoapi-3.1}
 ----------------------------------
 
 The `geoapi-3.1` branch implements the interfaces defined in [GeoAPI 3.1 snapshot][geoapi-snapshot]
milestones.
-It has the same content that the `geoapi-4.0` branch, excluding changes that are incompatible
with GeoAPI 3.0.
+It has the same content that the `geoapi-4.0` branch, excluding changes that are incompatible
with GeoAPI 3.0.1.
 Developments happen on `geoapi-4.0` and are periodically merged to `geoapi-3.1` with the
necessary modifications.
-This branch is used merely as an intermediate step between the `geoapi-4.0` branch and `master`.
+This branch is used merely as an intermediate step between the development branch (`geoapi-4.0`)
and `master`.
 Its content may be fully merged to `master` in the future, after new GeoAPI releases from
OGC.
 
 
@@ -137,7 +137,7 @@ Substitution for non-existent classes
 When using a JDK9 class that does not exist on JDK8, define a class of the same name in a
 `org.apache.sis.internal` sub-package with the minimal amount of needed functionalities,
 provided that it can be done with reasonable effort. Otherwise just delete the JDK9-dependent
-code from the JDK8 branch.
+code from the development branch.
 
 
 [geoapi-stable]:   http://www.geoapi.org/3.0/index.html

Modified: sis/site/trunk/content/contributor.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/contributor.mdtext?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/contributor.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/contributor.mdtext [UTF-8] Wed Jun 20 10:49:05 2018
@@ -132,102 +132,6 @@ the functionality available in the base
 
 
 
-
-Fetching and editing source code    {#source}
-=============================================
-
-Different SIS [branches](branches.html) are available depending on the target platforms.
-Unless working on a SIS port (e.g. the Android platform), contributors are encouraged
-to work on the SIS branch targeting the most recent JDK platform (currently JDK8):
-
-    :::bash
-    svn checkout https://svn.apache.org/repos/asf/sis/branches/JDK8 sis
-    cd sis
-    mvn install
-
-The [Source code](source.html) page provides tips for opening the files in an IDE,
-and guidelines about the way SIS source code is organized.
-
-
-
-
-Committing changes    {#commit}
-===============================
-
-Copies or displacements of files shall be done with the `svn copy` or `svn move` command,
respectively.
-Be aware that not all IDE or graphical tools perform this action appropriately.
-**Always verify on the command-line**, at least the first times that a new tools is used,
by executing `svn status`.
-Files that have been moved or copied shall have a `+` symbol in the left margin, like below:
-
-    :::text
-    D       my-directory/the-old-filename
-    A  +    my-directory/the-new-filename
-
-Using the proper SVN command is necessary for preserving the history, preserving the [SVN
properties](#svn-config),
-and consuming less space on the Apache server hosting the source code repository.
-
-
-
-
-Configuring Subversion properties    {#svn-config}
---------------------------------------------------
-
-Subversion can associate properties to each tracked files. Those properties tell to Subversion
-how to handle platform-specific aspects like end-of-line characters, and how to serve the
files
-to web browsers (MIME type, encoding, <i>etc.</i>).
-Those properties are typically set when a new file is added, not during modifications.
-Developers can specify default properties for all their Subversion working copies as below:
-
-  * Open `~/.subversion/config` in an editor, where `~` is the user home directory.
-  * Set the `enable-auto-props` value to `yes`.
-  * Scroll down to the `[auto-props]` section and make sure to assign the appropriate
-    (usually `native`) value to the End Of Line (EOL) style of the files to be edited.
-
-Below is an example of a portion of Subversion configuration file
-(real configuration files are typically larger):
-
-    :::ini
-    [miscellany]
-    # Whitespace-delimited globs which Subversion will ignore in its 'status' output.
-    global-ignores = *.class *.jar .* *~
-
-    # Enables automatic properties (defined below) for 'svn add' and 'svn import'.
-    enable-auto-props = yes
-
-    # Section for configuring automatic properties.
-    # The file-name-pattern can contain wildcards such as '*' and '?'.
-    # All entries which match will be applied to the file.
-    [auto-props]
-    *.java       = svn:mime-type=text/plain;svn:eol-style=native
-    *.sql        = svn:mime-type=text/plain;svn:eol-style=native
-    *.txt        = svn:mime-type=text/plain;svn:eol-style=native
-    *.properties = svn:mime-type=text/plain;svn:eol-style=native
-    *.xml        = svn:mime-type=text/xml;svn:eol-style=native
-    *.xsd        = svn:mime-type=text/xml;svn:eol-style=native
-    *.sld        = svn:mime-type=text/xml;svn:eol-style=native
-    *.gml        = svn:mime-type=text/xml;svn:eol-style=native
-    *.xsl        = svn:mime-type=text/xsl;svn:eol-style=native
-    *.html       = svn:mime-type=text/html;svn:eol-style=native
-    *.xhtml      = svn:mime-type=text/html;svn:eol-style=native
-    *.css        = svn:mime-type=text/css;svn:eol-style=native
-    *.bat        = svn:eol-style=CRLF
-    *.sh         = svn:eol-style=native;svn:executable
-    *.bmp        = svn:mime-type=image/bmp
-    *.png        = svn:mime-type=image/png
-    *.jpg        = svn:mime-type=image/jpeg
-    *.jpeg       = svn:mime-type=image/jpeg
-    *.gif        = svn:mime-type=image/gif
-    *.tif        = svn:mime-type=image/tiff
-    *.tiff       = svn:mime-type=image/tiff
-    *.zip        = svn:mime-type=application/zip
-    *.utf        = svn:mime-type=application/octet-stream
-    *.shp        = svn:mime-type=application/octet-stream
-    *.shx        = svn:mime-type=application/octet-stream
-    *.dbf        = svn:mime-type=application/octet-stream
-    README       = svn:mime-type=text/plain;svn:eol-style=native
-
-
-
 *[ISO]: International Organization for Standardization
 *[OGC]: Open Geospatial Consortium
 

Modified: sis/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/index.mdtext?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/index.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/index.mdtext [UTF-8] Wed Jun 20 10:49:05 2018
@@ -74,7 +74,7 @@ Following links are for those who wish t
   * [New contributor](contributor.html): background knowledge.
   * [Source code](source.html): fetching the code, opening in an IDE, formatting.
   * [Build](build.html): build from the source, create the PACK200 file.
-  * [Branches](branches.html): trunk, JDK8, JDK9.
+  * [Branches](branches.html): master, geoapi-3.1, geoapi-4.0
   * [Issue tracking][JIRA]: JIRA.
   * [Release management](release-management.html) (for release managers)
   * [Web site management](site-management.html) (for release managers and site maintainers)

Modified: sis/site/trunk/content/release-management-setup.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/release-management-setup.mdtext?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/release-management-setup.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/release-management-setup.mdtext [UTF-8] Wed Jun 20 10:49:05 2018
@@ -29,12 +29,12 @@ Directory layout    {#directory-layout}
 =======================================
 
 The steps described in the _release management_ page assume the following directory layout.
-Some directories are SVN checkout, other are ordinary directories. Any other layout can be
used.
+Some directories are Git checkout, other are ordinary directories. Any other layout can be
used.
 However in the later case, all relative paths in the _release management_ page will need
to be adjusted accordingly.
 
     :::text
     <any root directory for SIS>
-    ├─ trunk
+    ├─ master
     ├─ branches
     ├─ tags
     ├─ non-free
@@ -48,7 +48,7 @@ However in the later case, all relative
 Create the above directory structure as below:
 
     :::bash
-    svn checkout https://svn.apache.org/repos/asf/sis/trunk
+    git clone    https://gitbox.apache.org/repos/asf/sis.git master
     svn checkout https://svn.apache.org/repos/asf/sis/data/non-free
     svn checkout https://svn.apache.org/repos/asf/sis/release-test
     svn checkout https://svn.apache.org/repos/asf/sis/site/trunk site
@@ -150,7 +150,7 @@ The other commiter should verify that th
     gpg --send-key <key_id>
 
 The above-cited _Release Signing_ page provides more instructions.
-Then, the signed public key shall be appended to the `KEYS` file on the [SIS source code
repository][svn],
+Then, the signed public key shall be appended to the `KEYS` file on the [SIS source code
repository][source],
 then copied to the [SIS distribution directory][dist].
 
 
@@ -220,6 +220,6 @@ Notes:
 [PGP]:     http://www.apache.org/dev/openpgp.html
 [signing]: http://www.apache.org/dev/release-signing.html
 [maven]:   http://www.apache.org/dev/publishing-maven-artifacts.html
-[svn]:     https://svn.apache.org/repos/asf/sis/trunk/
+[source]:  https://gitbox.apache.org/repos/asf?p=sis.git
 [dist]:    http://dist.apache.org/repos/dist/release/sis/
 [MIT]:     http://pgp.mit.edu

Modified: sis/site/trunk/content/release-management.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/release-management.mdtext?rev=1833905&r1=1833904&r2=1833905&view=diff
==============================================================================
--- sis/site/trunk/content/release-management.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/release-management.mdtext [UTF-8] Wed Jun 20 10:49:05 2018
@@ -71,7 +71,7 @@ in this page shall be adjusted according
 
     :::text
     <any root directory for SIS>
-    ├─ trunk
+    ├─ master
     ├─ branches
     │  └─ $NEW_VERSION
     ├─ tags
@@ -104,7 +104,7 @@ For example the `javadoc` tool of older
 Prepare web site and source code before branching    {#prepare-source}
 ======================================================================
 
-Before to start the release process, we need to test more extensively the trunk.
+Before to start the release process, we need to test more extensively the master.
 The tests described below often reveal errors that were unnoticed in daily builds.
 It is better to detect and fix them before to create the branch.
 First:
@@ -157,8 +157,8 @@ It will not yet be published on `http://
 
 
 
-Test trunk extensively    {#test-trunk}
----------------------------------------
+Test master extensively    {#test-master}
+-----------------------------------------
 
 Build the project with the `apache-release` profile enabled.
 This profile performs the following actions:
@@ -173,7 +173,7 @@ This profile performs the following acti
 Each of those additional products may cause a failure that did not happen in normal builds.
 
     :::bash
-    cd ../trunk
+    cd ../master
     mvn clean install --activate-profiles apache-release --define bootclasspath=$BOOTCLASSPATH
 
 Verify signature for all files:
@@ -209,18 +209,18 @@ Source code    {#prepare-code}
 ------------------------------
 
 Replace the `$OLD_VERSION` number by `$NEW_VERSION` in the following literals.
-Those changes need to be applied on the development branch and merged with all other branches
and trunk.
+Those changes need to be applied on the development branch and merged with all other branches
and master.
 
   * `DOWNLOAD_URL` in `application/sis-console/src/main/java/org/apache/sis/console/ResourcesDownloader.java`
file.
   * `<sis.non-free.version>` in root `pom.xml` file.
 
-Commit and merge to other branches and to trunk.
+Commit and merge to other branches and to master.
 
     :::bash
-    svn commit --message "Set the EPSG geodetic dataset URL to its expected location after
release."
-    cd ../JDK7
-    svn merge ../JDK8
-    # Repeat the above commit and the merge commands for other branches until the changes
are merged to trunk.
+    git commit --message "Set the EPSG geodetic dataset URL to its expected location after
release."
+    git checkout geoapi-3.1
+    git merge
+    # Repeat the above commit and the merge commands for other branches until the changes
are merged to master.
 
 
 
@@ -230,20 +230,15 @@ Create branch and tag    {#branch}
 Execute the following command:
 
     :::bash
-    svn copy https://svn.apache.org/repos/asf/sis/trunk \
-             https://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION \
-             --message "Create the $NEW_VERSION branch."
+    git checkout -b $NEW_VERSION
 
-Move to a directory containing the project branches (presumed to be `../branches` in the
following command,
-but can be replaced by anything else), then checkout a clean copy of the branch to release:
+It is okay to checkout the branch in a separated directory if desired.
+The `BRANCH_DIR` environment variable will specify that directory.
 
     :::bash
-    cd ../branches
-    svn checkout https://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION
-    cd $NEW_VERSION
     export BRANCH_DIR=`pwd`
 
-We need to update the Subversion URL and SIS version numbers not only in the `pom.xml` files,
+We need to update the SIS version numbers not only in the `pom.xml` files,
 but also in a few Java files. The following command performs the replacement using Ant.
 Note that this command does *not* yet remove the `-SNAPSHOT` suffix in version numbers
 (this will be done later, at tag creation time):
@@ -259,15 +254,15 @@ Remove the modules that are not yet read
 This may require removing `<module>` elements in the parent `pom.xml` file.
 
     :::bash
-    svn remove storage/sis-shapefile
-    svn remove application/sis-javafx
+    git rm storage/sis-shapefile
+    git rm application/sis-javafx
 
-Validate with `svn diff`, ensure that the build is not broken (we will run the tests later),
+Validate with `git diff`, ensure that the build is not broken (we will run the tests later),
 then commit the changes on the branch:
 
     :::bash
     mvn clean package --define skipTests=true --define bootclasspath=$BOOTCLASSPATH
-    svn commit --message "Prepare branch for $NEW_VERSION release."
+    git commit --message "Prepare branch for $NEW_VERSION release."
 
 
 
@@ -278,23 +273,18 @@ In theory, the next commands would be a
 However we perform those steps manually rather than relying on Maven for the following reasons:
 
   * Perform some additional changes on the tag.
-  * Reduce the amount of commits on SVN (avoid a rollback in branch directory).
   * Give more opportunities to take action before commit in case of problems.
   * We need a separated `install` phase first, for proper installation of `sis-build-helper`
plugin.
 
 First, create the tag:
 
     :::bash
-    svn copy https://svn.apache.org/repos/asf/sis/branches/$NEW_VERSION \
-             https://svn.apache.org/repos/asf/sis/tags/$NEW_VERSION \
-             --message "Create $NEW_VERSION tag for RC$RELEASE_CANDIDATE."
+    git tag $NEW_VERSION
 
-Checkout:
+It is okay to checkout the tag in a separated directory if desired.
+The `TAG_DIR` environment variable will specify that directory.
 
     :::bash
-    cd ../../tags
-    svn checkout https://svn.apache.org/repos/asf/sis/tags/$NEW_VERSION
-    cd $NEW_VERSION
     export TAG_DIR=`pwd`
 
 Update versions number in `pom.xml` files (like what `mvn release:prepare` would have done),
@@ -303,17 +293,17 @@ plus some additional files:
     :::bash
     ant -buildfile core/sis-build-helper/src/main/ant/prepare-release.xml tag -Dbranch.version=$NEW_VERSION
-Dsis.version=$NEW_VERSION
 
-Validate with `svn diff`, search `SNAPSHOT` in the whole source directory in case we missed
some, then commit:
+Validate with `git diff`, search `SNAPSHOT` in the whole source directory in case we missed
some, then commit:
 
     :::bash
-    svn commit --message "Fix version number to $NEW_VERSION (no -SNAPSHOT) and SVN directory."
+    git commit --message "Fix version number to $NEW_VERSION (no -SNAPSHOT)."
 
 
 
 Verify content    {#branch-verify}
 ----------------------------------
 
-Build and test the project in the same way than we did on trunk.
+Build and test the project in the same way than we did on master.
 In addition to testing, execution of an `install` phase before deployment is required for
our custom `sis-build-helper` plugin.
 
     :::bash
@@ -709,17 +699,17 @@ Delete the prior version:
 
 
 
-Update trunk for the next development cycle    {#next-release}
-==============================================================
+Update master for the next development cycle    {#next-release}
+===============================================================
 
 On the development branch (usually JDK8),
-update the version numbers in the `pom.xml` files on trunk with the following command:
+update the version numbers in the `pom.xml` files on master with the following command:
 
     :::bash
     mvn clean
     mvn release:update-versions --define autoVersionSubmodules=true
 
-This change will need to be merged manually on the JDK7 branch and on the trunk.
+This change will need to be merged manually on the JDK7 branch and on the master.
 Then on the development branch:
 
   * Edit the version number in the `application/sis-console/src/main/artifact/README` file.



Mime
View raw message