You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crunch.apache.org by jw...@apache.org on 2013/05/07 13:57:49 UTC
[2/2] git commit: Fix license headers
Fix license headers
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/0251bc60
Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/0251bc60
Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/0251bc60
Branch: refs/heads/master
Commit: 0251bc604b67a1d433f25e432271a67239fdafd1
Parents: 7bb1dcf
Author: Josh Wills <jw...@apache.org>
Authored: Mon May 6 21:39:26 2013 -0700
Committer: Josh Wills <jw...@apache.org>
Committed: Mon May 6 21:39:26 2013 -0700
----------------------------------------------------------------------
.../crunch/lib/sort/ReverseAvroComparator.java | 21 ++++++++------
.../crunch/lib/sort/ReverseWritableComparator.java | 21 ++++++++------
2 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
index d83071b..ca6ba33 100644
--- a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
+++ b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
@@ -1,16 +1,19 @@
/**
- * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
- *
- * Cloudera, Inc. 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
+ * 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
*
- * This software 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.
+ * 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.
*/
package org.apache.crunch.lib.sort;
http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
----------------------------------------------------------------------
diff --git a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
index c2d0c46..f356fc5 100644
--- a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
+++ b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
@@ -1,16 +1,19 @@
/**
- * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
- *
- * Cloudera, Inc. 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
+ * 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
*
- * This software 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.
+ * 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.
*/
package org.apache.crunch.lib.sort;
Re: [2/2] git commit: Fix license headers
Posted by Josh Wills <jw...@cloudera.com>.
On Tue, May 7, 2013 at 10:19 AM, Matthias Friedrich <ma...@mafr.de> wrote:
> On Tuesday, 2013-05-07, Josh Wills wrote:
> > Close it. We may need to fix the trevni thing too.
> >
> > Why doesn't rat pick it up?
>
> Because it's a valid license, it doesn't discriminate ;-)
>
LOL-- okay :) I get burned by this every time I setup a new Eclipse project
and forget to change my default header.
>
> Regards,
> Matthias
>
--
Director of Data Science
Cloudera <http://www.cloudera.com>
Twitter: @josh_wills <http://twitter.com/josh_wills>
Re: [2/2] git commit: Fix license headers
Posted by Matthias Friedrich <ma...@mafr.de>.
On Tuesday, 2013-05-07, Josh Wills wrote:
> Close it. We may need to fix the trevni thing too.
>
> Why doesn't rat pick it up?
Because it's a valid license, it doesn't discriminate ;-)
Regards,
Matthias
Re: [2/2] git commit: Fix license headers
Posted by Josh Wills <jo...@gmail.com>.
Close it. We may need to fix the trevni thing too.
Why doesn't rat pick it up?
On May 7, 2013 12:26 PM, "Matthias Friedrich" <ma...@mafr.de> wrote:
> Hmm, it seems there's still one with Cloudera license header left:
>
>
> crunch-hbase/src/main/java/org/apache/crunch/io/hbase/TableOutputFormat.java
>
> What do we do release-wise?
>
> Regards,
> Matthias
>
> On Tuesday, 2013-05-07, jwills@apache.org wrote:
> > Fix license headers
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/0251bc60
> > Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/0251bc60
> > Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/0251bc60
> >
> > Branch: refs/heads/master
> > Commit: 0251bc604b67a1d433f25e432271a67239fdafd1
> > Parents: 7bb1dcf
> > Author: Josh Wills <jw...@apache.org>
> > Authored: Mon May 6 21:39:26 2013 -0700
> > Committer: Josh Wills <jw...@apache.org>
> > Committed: Mon May 6 21:39:26 2013 -0700
> >
> > ----------------------------------------------------------------------
> > .../crunch/lib/sort/ReverseAvroComparator.java | 21 ++++++++------
> > .../crunch/lib/sort/ReverseWritableComparator.java | 21 ++++++++------
> > 2 files changed, 24 insertions(+), 18 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> > ----------------------------------------------------------------------
> > diff --git
> a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> > index d83071b..ca6ba33 100644
> > ---
> a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> > +++
> b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> > @@ -1,16 +1,19 @@
> > /**
> > - * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
> > - *
> > - * Cloudera, Inc. 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
> > + * 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
> > *
> > - * This software 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.
> > + * 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.
> > */
> > package org.apache.crunch.lib.sort;
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> > ----------------------------------------------------------------------
> > diff --git
> a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> > index c2d0c46..f356fc5 100644
> > ---
> a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> > +++
> b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> > @@ -1,16 +1,19 @@
> > /**
> > - * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
> > - *
> > - * Cloudera, Inc. 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
> > + * 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
> > *
> > - * This software 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.
> > + * 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.
> > */
> > package org.apache.crunch.lib.sort;
> >
> >
>
Re: [2/2] git commit: Fix license headers
Posted by Matthias Friedrich <ma...@mafr.de>.
Hmm, it seems there's still one with Cloudera license header left:
crunch-hbase/src/main/java/org/apache/crunch/io/hbase/TableOutputFormat.java
What do we do release-wise?
Regards,
Matthias
On Tuesday, 2013-05-07, jwills@apache.org wrote:
> Fix license headers
>
>
> Project: http://git-wip-us.apache.org/repos/asf/crunch/repo
> Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/0251bc60
> Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/0251bc60
> Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/0251bc60
>
> Branch: refs/heads/master
> Commit: 0251bc604b67a1d433f25e432271a67239fdafd1
> Parents: 7bb1dcf
> Author: Josh Wills <jw...@apache.org>
> Authored: Mon May 6 21:39:26 2013 -0700
> Committer: Josh Wills <jw...@apache.org>
> Committed: Mon May 6 21:39:26 2013 -0700
>
> ----------------------------------------------------------------------
> .../crunch/lib/sort/ReverseAvroComparator.java | 21 ++++++++------
> .../crunch/lib/sort/ReverseWritableComparator.java | 21 ++++++++------
> 2 files changed, 24 insertions(+), 18 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> ----------------------------------------------------------------------
> diff --git a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> index d83071b..ca6ba33 100644
> --- a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> +++ b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseAvroComparator.java
> @@ -1,16 +1,19 @@
> /**
> - * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
> - *
> - * Cloudera, Inc. 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
> + * 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
> *
> - * This software 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.
> + * 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.
> */
> package org.apache.crunch.lib.sort;
>
>
> http://git-wip-us.apache.org/repos/asf/crunch/blob/0251bc60/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> ----------------------------------------------------------------------
> diff --git a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> index c2d0c46..f356fc5 100644
> --- a/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> +++ b/crunch-core/src/main/java/org/apache/crunch/lib/sort/ReverseWritableComparator.java
> @@ -1,16 +1,19 @@
> /**
> - * Copyright (c) 2013, Cloudera, Inc. All Rights Reserved.
> - *
> - * Cloudera, Inc. 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
> + * 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
> *
> - * This software 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.
> + * 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.
> */
> package org.apache.crunch.lib.sort;
>
>