Skip to content

Commit 13e0b15

Browse files
rpmoorerpmoore
committed
Merging master to get metadata updates
2 parents e6ce51f + 7195b57 commit 13e0b15

File tree

1,619 files changed

+24642
-4951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,619 files changed

+24642
-4951
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The SDK can also be included directly into a Maven or Gradle build. There is als
4141
<dependency>
4242
<groupId>com.spectralogic.ds3</groupId>
4343
<artifactId>ds3-sdk</artifactId>
44-
<version>3.2.8</version>
44+
<version>3.2.9</version>
4545
<!-- <classifier>all</classifier> -->
4646
</dependency>
4747
...
@@ -64,15 +64,15 @@ repositories {
6464
6565
dependencies {
6666
...
67-
compile 'com.spectralogic.ds3:ds3-sdk:3.2.8'
68-
// compile 'com.spectralogic.ds3:ds3-sdk:3.2.8:all'
67+
compile 'com.spectralogic.ds3:ds3-sdk:3.2.9'
68+
// compile 'com.spectralogic.ds3:ds3-sdk:3.2.9:all'
6969
...
7070
}
7171
7272
```
7373
## Javadoc
7474

75-
The latest javadoc is located at [http://spectralogic.github.io/ds3_java_sdkj/javadoc/](http://spectralogic.github.io/ds3_java_sdk/javadoc/)
75+
The latest javadoc is located at [http://spectralogic.github.io/ds3_java_sdk/javadoc/](http://spectralogic.github.io/ds3_java_sdk/javadoc/)
7676

7777
## Contributing
7878
If you would like to contribute to the source code, sign the [Contributors Agreement](https://developer.spectralogic.com/contributors-agreement/) and make sure that your source conforms to our [Java Style Guide](https://github.com/SpectraLogic/spectralogic.github.com/wiki/Java-Style-Guide). For an overview of how we use Github, please review our [Github Workflow](https://github.com/SpectraLogic/spectralogic.github.com/wiki/Github-Workflow).

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
allprojects {
1717
group = 'com.spectralogic.ds3'
18-
version = '3.2.12'
18+
version = '3.4.0-RC2'
1919
}
2020

2121
subprojects {

‎contract/3_2_2_contract.xml‎ renamed to ‎contract/3_4_1_contract.xml‎

Lines changed: 3629 additions & 750 deletions
Large diffs are not rendered by default.

‎docker/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# ds3-c-docker
2-
A public docker file that has all the dependencies to build and develop the DS3 C SDK
1+
# ds3-java-docker
2+
A public docker file that has all the dependencies to build and develop the DS3 Java SDK
33

44
To use this docker container, run the following command:
55

66
`sudo docker run -it spectralogic/ds3_java_docker_test`
77

8-
This will start the container with an interactive bash shell which will allow you to clone the ds3_c_sdk and then build it.
8+
This will start the container with an interactive bash shell which will allow you to clone the ds3_java_sdk and then build it.

‎ds3-interfaces/build.gradle‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* ******************************************************************************
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
14+
*/
15+
116
buildscript {
217
repositories { jcenter() }
318
dependencies {

‎ds3-interfaces/src/main/java/com/spectralogic/ds3client/helpers/MetadataAccess.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* ****************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
4-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5-
* this file except in compliance with the License. A copy of the License is located at
2+
* ******************************************************************************
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
66
*
7-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
88
*
9-
* or in the "license" file accompanying this file.
10-
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
* specific language governing permissions and limitations under the License.
13-
* ****************************************************************************
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
1414
*/
1515

1616
package com.spectralogic.ds3client.helpers;

‎ds3-interfaces/src/main/java/com/spectralogic/ds3client/helpers/MetadataReceivedListener.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* ****************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
4-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5-
* this file except in compliance with the License. A copy of the License is located at
2+
* ******************************************************************************
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
66
*
7-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
88
*
9-
* or in the "license" file accompanying this file.
10-
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
* specific language governing permissions and limitations under the License.
13-
* ****************************************************************************
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
1414
*/
1515

1616
package com.spectralogic.ds3client.helpers;

‎ds3-interfaces/src/main/java/com/spectralogic/ds3client/metadata/interfaces/MetadataRestore.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* ******************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
44
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. A copy of the License is located at
66
*

‎ds3-interfaces/src/main/java/com/spectralogic/ds3client/metadata/interfaces/MetadataStore.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* ******************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
44
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. A copy of the License is located at
66
*

‎ds3-interfaces/src/main/java/com/spectralogic/ds3client/networking/Headers.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* ****************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
4-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5-
* this file except in compliance with the License. A copy of the License is located at
2+
* ******************************************************************************
3+
* Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
66
*
7-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
88
*
9-
* or in the "license" file accompanying this file.
10-
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
* specific language governing permissions and limitations under the License.
13-
* ****************************************************************************
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
1414
*/
1515

1616
package com.spectralogic.ds3client.networking;

0 commit comments

Comments
 (0)