Skip to content
This repository has been archived by the owner on Apr 5, 2022. It is now read-only.

URL Cleanup #1935

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
with regard to the reporter of an incident.

This Code of Conduct is adapted from the
http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Once you've completed the web form, simply add the following in a comment on you

1. Go to [https://github.com/SpringSource/spring-xd](https://github.com/SpringSource/spring-xd)
2. Hit the "fork" button and choose your own github account as the target
3. For more detail see [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
3. For more detail see [https://help.github.com/fork-a-repo/](https://help.github.com/fork-a-repo/)

## Setup your Local Development Environment

Expand All @@ -55,14 +55,14 @@ _you should see branches on `origin` as well as `upstream`, including `master` (
* _Always_ work on topic branches (Typically use the Jira ticket ID as the branch name).
- For example, to create and switch to a new branch for issue XD-123: `git checkout -b XD-123`
* You might be working on several different topic branches at any given time, but when at a stopping point for one of those branches, commit (a local operation).
* Please follow the "Commit Guidelines" described in this chapter of Pro Git: [http://progit.org/book/ch5-2.html](http://progit.org/book/ch5-2.html)
* Please follow the "Commit Guidelines" described in this chapter of Pro Git: [https://progit.org/book/ch5-2.html](https://progit.org/book/ch5-2.html)
* Then to begin working on another issue (say XD-101): `git checkout XD-101`. The _-b_ flag is not needed if that branch already exists in your local repository.
* When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), e.g.: `git push origin XD-123`
* If you want to collaborate with another contributor, have them fork your repository (add it as a remote) and `git fetch <your-username>` to grab your branch. Alternatively, they can use `git fetch --all` to sync their local state with all of their remotes.
* If you grant that collaborator push access to your repository, they can even apply their changes to your branch.
* When ready for your contribution to be reviewed for potential inclusion in the master branch of the canonical spring-xd repository (what you know as 'upstream'), issue a pull request to the SpringSource repository (for more detail, see [http://help.github.com/send-pull-requests/](http://help.github.com/send-pull-requests/)).
* When ready for your contribution to be reviewed for potential inclusion in the master branch of the canonical spring-xd repository (what you know as 'upstream'), issue a pull request to the SpringSource repository (for more detail, see [https://help.github.com/send-pull-requests/](https://help.github.com/send-pull-requests/)).
* The project lead may merge your changes into the upstream master branch as-is, he may keep the pull request open yet add a comment about something that should be modified, or he might reject the pull request by closing it.
* A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state. **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. For a full explanation, see the Pro Git section on rebasing: [http://progit.org/book/ch3-6.html](http://progit.org/book/ch3-6.html). As stated there: "> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain."
* A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state. **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. For a full explanation, see the Pro Git section on rebasing: [https://progit.org/book/ch3-6.html](https://progit.org/book/ch3-6.html). As stated there: "> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain."

## Keeping your Local Code in Sync

Expand All @@ -76,8 +76,8 @@ _you should see branches on `origin` as well as `upstream`, including `master` (
- Then: `git pull upstream master`
- Switch back to the topic branch: `git checkout XD-123` (no -b needed since the branch already exists)
- Rebase the topic branch to minimize the distance between it and your recently synched master branch: `git rebase master`
(Again, for more detail see the Pro Git section on rebasing: [http://progit.org/book/ch3-6.html](http://progit.org/book/ch3-6.html))
* **Note** Be careful with rebasing if you have already pushed your branch to your remote because you'd be rewriting history. If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](http://stackoverflow.com/questions/134882/undoing-a-git-rebase). Once you have published your branch, you need to merge in the master rather than rebasing.
(Again, for more detail see the Pro Git section on rebasing: [https://progit.org/book/ch3-6.html](https://progit.org/book/ch3-6.html))
* **Note** Be careful with rebasing if you have already pushed your branch to your remote because you'd be rewriting history. If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](https://stackoverflow.com/questions/134882/undoing-a-git-rebase). Once you have published your branch, you need to merge in the master rather than rebasing.
* Now, if you issue a pull request, it is much more likely to be merged without conflicts. Most likely, any pull request that would produce conflicts will be deferred until the issuer of that pull request makes these adjustments.
* Assuming your pull request is merged into the 'upstream' master, you will actually end up pulling that change into your own master eventually, and at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there.
- to delete the local branch: `git branch -d INT-123`
Expand Down Expand Up @@ -192,7 +192,7 @@ Search the codebase to find related unit tests and add additional **@Test** meth

## Squash commits

Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here is one: http://book.git-scm.com/4_interactive_rebasing.html.
Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here is one: https://book.git-scm.com/4_interactive_rebasing.html.

## Use your real name in git commits

Expand Down Expand Up @@ -225,6 +225,6 @@ See the [Building Spring XD][] section of the reference documentation for instru

Add a comment to the associated JIRA issue(s) linking to your new pull request.

[help documentation]: http://help.github.com/send-pull-requests
[help documentation]: https://help.github.com/send-pull-requests
[JIRA issue tracker]: https://jira.springsource.org/browse/XD
[checking out and building]: https://github.com/SpringSource/spring-xd/wiki/Building-Spring-XD
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ You can fork the repository and/or monitor JIRA to see what is going on. As alwa

## Documentation

Look for it on the [XD wiki](https://github.com/springsource/spring-xd/wiki). [API Documentation](http://static.springsource.org/spring-xd/docs/current-SNAPSHOT/api/) (JavaDoc) is available as well. Please also visit the SpringSource.org [project website](http://www.springsource.org/spring-xd) for more information.
Look for it on the [XD wiki](https://github.com/springsource/spring-xd/wiki). [API Documentation](https://docs.spring.io/spring-xd/docs/current-SNAPSHOT/api/) (JavaDoc) is available as well. Please also visit the SpringSource.org [project website](https://www.springsource.org/spring-xd) for more information.

## How to build

Check the documentation on how to build Spring XD [here](http://docs.spring.io/spring-xd/docs/current-SNAPSHOT/reference/html/#building-spring-xd).
Check the documentation on how to build Spring XD [here](https://docs.spring.io/spring-xd/docs/current-SNAPSHOT/reference/html/#building-spring-xd).

## Getting Help

Expand All @@ -29,7 +29,7 @@ Here are some ways for you to get involved

* Create [JIRA](https://jira.springsource.org/browse/XD) tickets for bugs and new features and comment and vote on the ones that you are interested in.
* Follow the flow of developing on the [work board](https://jira.springsource.org/secure/RapidBoard.jspa?rapidView=6).
* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please familiarize yourself with the process outlined for contributing to Spring projects here: [Contributor Guidelines](https://github.com/SpringSource/spring-integration/wiki/Contributor-Guidelines).
* Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](https://help.github.com/forking/). If you want to contribute code this way, please familiarize yourself with the process outlined for contributing to Spring projects here: [Contributor Guidelines](https://github.com/SpringSource/spring-integration/wiki/Contributor-Guidelines).

Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup). Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team, and given the ability to merge pull requests.

Expand All @@ -51,4 +51,4 @@ Source Metrics are available via Sonar at:

[Spring XD JIRA]: https://jira.springsource.org/browse/XD
[Apache License]: http://www.apache.org/licenses/LICENSE-2.0
[Spring Data Book]: http://bit.ly/sd-book
[Spring Data Book]: https://bit.ly/sd-book
2 changes: 1 addition & 1 deletion config/servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
# Upper case only.
# Note: MANUAL requires specialized code in the consuming module and is unlikely to be
# used in an XD application. For more information, see
# http://docs.spring.io/spring-integration/reference/html/amqp.html#amqp-inbound-ack
# https://docs.spring.io/spring-integration/reference/html/amqp.html#amqp-inbound-ack
# autoBindDLQ: false
# backOffInitialInterval: 1000
# backOffMaxInterval: 10000
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Cassandra storage config YAML

# NOTE:
# See http://wiki.apache.org/cassandra/StorageConfiguration for
# See https://wiki.apache.org/cassandra/StorageConfiguration for
# full explanations of configuration directives
# /NOTE

Expand All @@ -20,14 +20,14 @@ cluster_name: 'Test Cluster'
# Specifying initial_token will override this setting.
#
# If you already have a cluster with 1 token per node, and wish to migrate to
# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
# multiple tokens per node, see https://wiki.apache.org/cassandra/Operations
# num_tokens: 256

# If you haven't specified num_tokens, or have set it to the default of 1 then
# you should always specify InitialToken when setting up a production
# cluster for the first time, and often when adding capacity later.
# The principle is that each node should be given an equal slice of
# the token ring; see http://wiki.apache.org/cassandra/Operations
# the token ring; see https://wiki.apache.org/cassandra/Operations
# for more details.
#
# If blank, Cassandra will request a token bisecting the range of
Expand All @@ -36,7 +36,7 @@ cluster_name: 'Test Cluster'
# a random token, which will lead to hot spots.
initial_token:

# See http://wiki.apache.org/cassandra/HintedHandoff
# See https://wiki.apache.org/cassandra/HintedHandoff
hinted_handoff_enabled: true
# this defines the maximum amount of time a dead host will have hints
# generated. After it has been dead this long, new hints for it will not be
Expand Down Expand Up @@ -98,7 +98,7 @@ authorizer: org.apache.cassandra.auth.AllowAllAuthorizer
# - CollatingOPP collates according to EN,US rules rather than lexical byte
# ordering. Use this as an example if you need custom collation.
#
# See http://wiki.apache.org/cassandra/Operations for more on
# See https://wiki.apache.org/cassandra/Operations for more on
# partitioners and token selection.
partitioner: org.apache.cassandra.dht.Murmur3Partitioner

Expand Down Expand Up @@ -586,7 +586,7 @@ index_interval: 128
#
# The passwords used in these options must match the passwords used when generating
# the keystore and truststore. For instructions on generating these files, see:
# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
# https://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
#
server_encryption_options:
internode_encryption: none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/**
* Parses a string into a collection of words based on the
* <a href="http://pubs.opengroup.org/onlinepubs/009695399/toc.htm">POSIX / SUSv3 standard</a>. The functionality in
* <a href="https://pubs.opengroup.org/onlinepubs/009695399/toc.htm">POSIX / SUSv3 standard</a>. The functionality in
* this class is ported from the Ruby
* <a href="https://github.com/rubysl/rubysl-shellwords/blob/2.0/lib/rubysl/shellwords/shellwords.rb">Shellwords</a>
* module.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd">
xsi:schemaLocation="http://www.springframework.org/schema/tool https://www.springframework.org/schema/tool/spring-tool.xsd">

<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>
schemaLocation="https://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>

<xsd:annotation>
<xsd:documentation>
Expand Down
14 changes: 7 additions & 7 deletions scripts/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

The MIT License

Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
Copyright (c) 2010-2014 Google, Inc. https://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -793,7 +793,7 @@ This software is provided "as is", without any warranty.
"This product includes software developed by the
JDOM Project (http://www.jdom.org/)."
Alternatively, the acknowledgment may be graphical using the logos
available at http://www.jdom.org/images/logos.
available at http://www.jdom.org/images/logos/.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Expand Down Expand Up @@ -876,7 +876,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>>> angular-busy 4.0.4

Copyright 2014 jQuery Foundation and other contributors
http://jquery.com/
https://jquery.com/

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down Expand Up @@ -960,7 +960,7 @@ General Public License Version 2 only ("GPL") or the Common Development
and Distribution License("CDDL") (collectively, the "License"). You
may not use this file except in compliance with the License. You can
obtain a copy of the License at
http://glassfish.java.net/public/CDDL+GPL_1_1.html
https://glassfish.java.net/public/CDDL+GPL_1_1.html
or packager/legal/LICENSE.txt. See the License for the specific
language governing permissions and limitations under the License.

Expand Down Expand Up @@ -997,7 +997,7 @@ Copyright (c) 1999-2001 Xerox Corporation,

All rights reserved.

This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html
This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution and is available at https://www.eclipse.org/legal/epl-v10.html


>>> aspectjweaver-1.6.12
Expand All @@ -1008,7 +1008,7 @@ All rights reserved.
This program and the accompanying materials are made available
under the terms of the Eclipse Public License v1.0
which accompanies this distribution and is available at
http://www.eclipse.org/legal/epl-v10.html
https://www.eclipse.org/legal/epl-v10.html

Contributors:
PARC initial implementation
Expand Down Expand Up @@ -1040,4 +1040,4 @@ Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this software; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA, or see the FSF site: http://www.fsf.org.
02110-1301 USA, or see the FSF site: https://www.fsf.org.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* <p>
* The value of the average will depend on whether a weight ('alpha') is set for the gauge. If it is unset, the average
* will contain a simple arithmetic mean. If a weight is set, an exponential moving average will be calculated as
* defined in this <a href="http://www.itl.nist.gov/div898/handbook/pmc/section4/pmc431.htm">NIST document</a>.
* defined in this <a href="https://www.itl.nist.gov/div898/handbook/pmc/section4/pmc431.htm">NIST document</a>.
*
* @author Luke Taylor
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* to zero.
*
* Supports a "smoothing constant", "alpha" for use in calculating an <a
* href="http://www.itl.nist.gov/div898/handbook/pmc/section4/pmc431.htm">exponential moving average</a> for the
* href="https://www.itl.nist.gov/div898/handbook/pmc/section4/pmc431.htm">exponential moving average</a> for the
* gauge.
* The parameter can be changed at any time after the gauge has been created. The mean calculated up to that point will
* be used to initialize the moving average from that point on.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public boolean exists(String s) {
@Override
public List<M> findAll() {
List<M> gauges = new ArrayList<M>();
// TODO asking for keys is not recommended. See http://redis.io/commands/keys
// TODO asking for keys is not recommended. See https://redis.io/commands/keys
// Need to keep track of created instances explicitly.
Set<String> keys = this.redisOperations.keys(this.metricPrefix + "*");
for (String key : keys) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public boolean exists(String s) {
public List<FieldValueCounter> findAll() {
List<FieldValueCounter> counters = new ArrayList<FieldValueCounter>();
// TODO asking for keys is not recommended. See
// http://redis.io/commands/keys
// https://redis.io/commands/keys
Set<String> keys = this.redisTemplate.keys(this.metricPrefix + "*");
for (String key : keys) {
// TODO remove this naming convention for minute aggregates
Expand Down
Loading