Skip to content

Commit

Permalink
1 10 merge java copyright header changes (#392)
Browse files Browse the repository at this point in the history
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder
  • Loading branch information
byrnHDF authored Mar 1, 2021
1 parent dea591a commit c14fa9c
Show file tree
Hide file tree
Showing 192 changed files with 8 additions and 196 deletions.
1 change: 0 additions & 1 deletion java/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Alloc.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Checksum.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Chunk.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Compact.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_External.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_FillValue.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Gzip.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Hyperslab.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Nbit.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_ReadWrite.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Shuffle.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Sofloat.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Soint.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Szip.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_Transform.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_UnlimitedAdd.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_UnlimitedGzip.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/H5Ex_D_UnlimitedMod.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/JavaDatasetExample.sh.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#! /bin/sh
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/datasets/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Array.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_ArrayAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Bit.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_BitAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Commit.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Compound.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_CompoundAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Float.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_FloatAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Integer.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_IntegerAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_ObjectReference.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_Opaque.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_OpaqueAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_String.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_StringAttribute.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/H5Ex_T_VLString.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/JavaDatatypeExample.sh.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#! /bin/sh
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/datatypes/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#
# Copyright by The HDF Group.
# Copyright by the Board of Trustees of the University of Illinois.
# All rights reserved.
#
# This file is part of HDF5. The full HDF5 copyright notice, including
Expand Down
1 change: 0 additions & 1 deletion java/examples/groups/H5Ex_G_Compact.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
1 change: 0 additions & 1 deletion java/examples/groups/H5Ex_G_Corder.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* Copyright by the Board of Trustees of the University of Illinois. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
Expand Down
Loading

0 comments on commit c14fa9c

Please sign in to comment.