New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
start fixing spelling #2343
start fixing spelling #2343
Changes from all commits
fbb303f
843c3e0
88cb434
0817583
f64c0bb
814b19b
924ff4d
6556a76
0d9a32a
af8e3c3
ed642cf
19c24d6
0fdd6a9
79d65ef
89ed1af
83179c7
f58af83
e231851
e7c4821
c6f1922
7027bb1
d1ddb39
31ae6f9
f8c1e37
862274b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ Review a couple of the repository search websites: | |
<version>1.0.2</version> | ||
</dependency> | ||
|
||
3. Navigate to the root pom.xml for the project and go to the dependency management section. | ||
3. Navigate to the root ``pom.xml`` for the project and go to the dependency management section. | ||
|
||
Cut and past paste the dependency information here as well:: | ||
|
||
|
@@ -40,7 +40,7 @@ Review a couple of the repository search websites: | |
<version>1.0.2</version> | ||
</dependency> | ||
|
||
3. You can then adjust your pom.xml to not include the version number (as it will be retrieved | ||
3. You can then adjust your ``pom.xml`` to not include the version number (as it will be retrieved | ||
from the dependency management section).:: | ||
|
||
<dependency> | ||
|
@@ -52,14 +52,14 @@ Review a couple of the repository search websites: | |
Recommended reading on Dependencies | ||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
If you are not familiar with the way to declare a dependency in a Maven pom.xml file, see "How do I use external dependencies?" in the Maven Getting started guide. More information can also be found in the Guide to deploying 3rd party JARs to remote repository in Maven documentation. | ||
If you are not familiar with the way to declare a dependency in a Maven ``pom.xml`` file, see "How do I use external dependencies?" in the Maven Getting started guide. More information can also be found in the Guide to deploying 3rd party JARs to remote repository in Maven documentation. | ||
|
||
References: | ||
|
||
* http://maven.apache.org/guides/getting-started/index.html | ||
* http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html | ||
|
||
Our build process does not include jar files inside the subversion repository, instead Maven downloads jar files it needs from remote repositories (web sites). The location of these web sites is specified in the parent pom.xml file, which is inherited by all modules. There are mainly three sites available: | ||
Our build process does not include jar files inside the subversion repository, instead Maven downloads jar files it needs from remote repositories (web sites). The location of these web sites is specified in the parent ``pom.xml`` file, which is inherited by all modules. There are mainly three sites available: | ||
|
||
* Java.net repository | ||
|
||
|
@@ -82,14 +82,14 @@ Our build process does not include jar files inside the subversion repository, i | |
|
||
General utility open source projects, especially apache related | ||
|
||
Take a look at these sites and some of the "mystery" out of how Maven works. You may notice that the directory structure matches the dependency entries that you see in the pom.xml files. If the dependency entry has a groupId tag then this will be the name of the folder, if it just has an id tag then this will be used for the name of the folder and the jar within it. | ||
Take a look at these sites and some of the "mystery" out of how Maven works. You may notice that the directory structure matches the dependency entries that you see in the ``pom.xml`` files. If the dependency entry has a groupId tag then this will be the name of the folder, if it just has an id tag then this will be used for the name of the folder and the jar within it. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the dependency entry has a |
||
|
||
It is always worth taking a look at these sites (particularly the maven one) just to check that a version of the jar you want to use is not already available. | ||
|
||
It really is not available - how to upload? | ||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
Assuming the jar you want is not already hosted on one of these sites you need to upload it and add a dependency entry to your pom.xml file. | ||
Assuming the jar you want is not already hosted on one of these sites you need to upload it and add a dependency entry to your ``pom.xml`` file. | ||
|
||
* Upload with Maven (not by copy-and-paste) | ||
|
||
|
@@ -169,7 +169,7 @@ Uploading to Ibiblio | |
Examples of Updating JTS Jar | ||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
1. Change into one of the GeoTools directories (the geotools pom.xml has all the | ||
1. Change into one of the GeoTools directories (the geotools ``pom.xml`` has all the | ||
repository definitions so changing directories is easier than editing your settings.xml):: | ||
|
||
C:\> cd java\geotools\trunk | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,7 @@ The modules/unsupported/ directory is there to welcome your experimental work; t | |
|
||
#. pom.xml | ||
|
||
We start by getting the pom.xml configured since maven will need that to work against the module. The following will start you out: | ||
We start by getting the ``pom.xml`` configured since maven will need that to work against the module. The following will start you out: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since Maven will need |
||
|
||
Change all occurances of the word example to the name of your module:: | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -244,7 +244,7 @@ of for rebasing include: | |
|
||
It is **critically important** that rebasing never occur on a shared or primary | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. that rebasing never occurs on a shared |
||
branch. The rule of thumb with rebasing is that you must **never** rewrite commits | ||
that are not strictly local, ie commits that have been pushed up to an online | ||
that are not strictly local, i.e. commits that have been pushed up to an online | ||
repository. | ||
|
||
Other Tips | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ Versions and revisions | |
|
||
When performing a release we don't require a "code freeze" in which no developers can commit to the repository. Instead we release from a revision that is known to pass all tests, including unit/integration tests as well as CITE tests on the GeoServer side. These instructions are valid in case you are making a release in combination with GeoServer, if you are making a stand alone release it's up to you to choose the proper GIT revision number for the GeoTools released to be picked from. | ||
|
||
To obtain the GeoServer and Geotools revisions that have passed the `CITE test <https://build.geoserver.org/view/testing-cite/>`_, navigate to the latest Jenkins run of the CITE test and view it's console output and select to view its full log. For example: | ||
To obtain the GeoServer and GeoTools revisions that have passed the `CITE test <https://build.geoserver.org/view/testing-cite/>`_, navigate to the latest Jenkins run of the CITE test and view it's console output and select to view its full log. For example: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and view its console output |
||
|
||
https://build.geoserver.org/job/2.11-cite-wms-1.1/286/consoleText | ||
|
||
|
@@ -77,10 +77,10 @@ When creating the first release candidate of a series, there are some extra step | |
|
||
* Enable `GitHub branch protection <https://github.com/geotools/geotools/settings/branches>`_ for the new stable branch: tick "Protect this branch" (only) and press "Save changes". | ||
|
||
* Checkout the master branch and update the version in all pom.xml files and a few miscellaneous files; for example, if changing master from ``17-SNAPSHOT`` to ``18-SNAPSHOT``:: | ||
* Checkout the master branch and update the version in all ``pom.xml`` files and a few miscellaneous files; for example, if changing master from ``17-SNAPSHOT`` to ``18-SNAPSHOT``:: | ||
|
||
git checkout master | ||
find . -name pom.xml -exec sed -i 's/17-SNAPSHOT/18-SNAPSHOT/g' {} \; | ||
find . -name ``pom.xml`` -exec sed -i 's/17-SNAPSHOT/18-SNAPSHOT/g' {} \; | ||
sed -i 's/17-SNAPSHOT/18-SNAPSHOT/g' \ | ||
build/rename.xml \ | ||
docs/build.xml \ | ||
|
@@ -129,7 +129,7 @@ Run the `geotools-release <https://build.geoserver.org/view/geotools/job/geotool | |
|
||
**REV** | ||
|
||
The Git revision number to release from. eg, "24ae10fe662c....". If left blank the latest revision (ie HEAD) on the ``BRANCH`` being released is used. | ||
The Git revision number to release from. eg, "24ae10fe662c....". If left blank the latest revision (i.e. HEAD) on the ``BRANCH`` being released is used. | ||
|
||
**VERSION** | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code will fail for the next great (...)
Unfortunately, the initial fix for this axis order (...)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've fixed this one, but in general you can make these one liner fixes directly in git.