Skip to content

Commit 96da4b1

Browse files
author
Sean Fitts
committed
Normalize line endings
This uses the recommended strategy to normalize line endings for mixed Windows/*nix development. We also make sure that the shell scripts used for testing have Unix line endings on all platforms so they will function properly.
1 parent 6a2110c commit 96da4b1

18 files changed

Lines changed: 2123 additions & 2106 deletions

‎.gitattributes‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Unix shell files use Unix line endings
5+
*.sh text eol=lf
6+
7+
# Standard to msysgit
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
10+
*.docx diff=astextplain
11+
*.DOCX diff=astextplain
12+
*.dot diff=astextplain
13+
*.DOT diff=astextplain
14+
*.pdf diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain

‎src/main/java/com/github/dockerjava/client/model/ChangeLog.java‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
package com.github.dockerjava.client.model;
2-
3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
5-
6-
/**
7-
*
8-
* @author Konstantin Pelykh (kpelykh@gmail.com)
9-
*
10-
*/
11-
@JsonIgnoreProperties(ignoreUnknown = true)
12-
public class ChangeLog {
13-
14-
@JsonProperty("Path")
15-
private String path;
16-
17-
@JsonProperty("Kind")
18-
private int kind;
19-
20-
public String getPath() {
21-
return path;
22-
}
23-
24-
public int getKind() {
25-
return kind;
26-
}
27-
28-
@Override
29-
public String toString() {
30-
return "ChangeLog{" +
31-
"path='" + path + '\'' +
32-
", kind=" + kind +
33-
'}';
34-
}
35-
}
1+
package com.github.dockerjava.client.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
6+
/**
7+
*
8+
* @author Konstantin Pelykh (kpelykh@gmail.com)
9+
*
10+
*/
11+
@JsonIgnoreProperties(ignoreUnknown = true)
12+
public class ChangeLog {
13+
14+
@JsonProperty("Path")
15+
private String path;
16+
17+
@JsonProperty("Kind")
18+
private int kind;
19+
20+
public String getPath() {
21+
return path;
22+
}
23+
24+
public int getKind() {
25+
return kind;
26+
}
27+
28+
@Override
29+
public String toString() {
30+
return "ChangeLog{" +
31+
"path='" + path + '\'' +
32+
", kind=" + kind +
33+
'}';
34+
}
35+
}

‎src/main/java/com/github/dockerjava/client/model/CommitConfig.java‎

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
package com.github.dockerjava.client.model;
2-
3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4-
import com.fasterxml.jackson.annotation.JsonProperty;
5-
6-
/**
7-
*
8-
* @author Konstantin Pelykh (kpelykh@gmail.com)
9-
*
10-
*/
11-
@JsonIgnoreProperties(ignoreUnknown = true)
12-
public class CommitConfig {
13-
14-
@JsonProperty("container")
15-
private String containerId;
16-
17-
@JsonProperty("repo")
18-
private String repo;
19-
20-
@JsonProperty("tag")
21-
private String tag;
22-
23-
@JsonProperty("m")
24-
private String message;
25-
26-
//author (eg. “John Hannibal Smith <hannibal@a-team.com>”)
27-
@JsonProperty("author")
28-
private String author;
29-
30-
//config automatically applied when the image is run. (ex: {“Cmd”: [“cat”, “/world”], “PortSpecs”:[“22”]})
31-
@JsonProperty("run")
32-
private String run;
33-
34-
public String getContainerId() {
35-
return containerId;
36-
}
37-
38-
public String getRepo() {
39-
return repo;
40-
}
41-
42-
public String getTag() {
43-
return tag;
44-
}
45-
46-
public String getMessage() {
47-
return message;
48-
}
49-
50-
public String getAuthor() {
51-
return author;
52-
}
53-
54-
public String getRun() {
55-
return run;
56-
}
57-
58-
public CommitConfig setRepo(String repo) {
59-
this.repo = repo;
60-
return this;
61-
}
62-
63-
public CommitConfig setTag(String tag) {
64-
this.tag = tag;
65-
return this;
66-
}
67-
68-
public CommitConfig setMessage(String message) {
69-
this.message = message;
70-
return this;
71-
}
72-
73-
public CommitConfig setAuthor(String author) {
74-
this.author = author;
75-
return this;
76-
}
77-
78-
public CommitConfig setRun(String run) {
79-
this.run = run;
80-
return this;
81-
}
82-
83-
public CommitConfig(String containerId) {
84-
this.containerId = containerId;
85-
}
86-
87-
}
1+
package com.github.dockerjava.client.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
6+
/**
7+
*
8+
* @author Konstantin Pelykh (kpelykh@gmail.com)
9+
*
10+
*/
11+
@JsonIgnoreProperties(ignoreUnknown = true)
12+
public class CommitConfig {
13+
14+
@JsonProperty("container")
15+
private String containerId;
16+
17+
@JsonProperty("repo")
18+
private String repo;
19+
20+
@JsonProperty("tag")
21+
private String tag;
22+
23+
@JsonProperty("m")
24+
private String message;
25+
26+
//author (eg. “John Hannibal Smith <hannibal@a-team.com>”)
27+
@JsonProperty("author")
28+
private String author;
29+
30+
//config automatically applied when the image is run. (ex: {“Cmd”: [“cat”, “/world”], “PortSpecs”:[“22”]})
31+
@JsonProperty("run")
32+
private String run;
33+
34+
public String getContainerId() {
35+
return containerId;
36+
}
37+
38+
public String getRepo() {
39+
return repo;
40+
}
41+
42+
public String getTag() {
43+
return tag;
44+
}
45+
46+
public String getMessage() {
47+
return message;
48+
}
49+
50+
public String getAuthor() {
51+
return author;
52+
}
53+
54+
public String getRun() {
55+
return run;
56+
}
57+
58+
public CommitConfig setRepo(String repo) {
59+
this.repo = repo;
60+
return this;
61+
}
62+
63+
public CommitConfig setTag(String tag) {
64+
this.tag = tag;
65+
return this;
66+
}
67+
68+
public CommitConfig setMessage(String message) {
69+
this.message = message;
70+
return this;
71+
}
72+
73+
public CommitConfig setAuthor(String author) {
74+
this.author = author;
75+
return this;
76+
}
77+
78+
public CommitConfig setRun(String run) {
79+
this.run = run;
80+
return this;
81+
}
82+
83+
public CommitConfig(String containerId) {
84+
this.containerId = containerId;
85+
}
86+
87+
}

0 commit comments

Comments
 (0)