Skip to content

Commit b6a3d69

Browse files
arakelianarakelian
committed
Upgrade dependencies and license
1 parent 61e39c1 commit b6a3d69

10 files changed

+156
-38
lines changed

‎.settings/com.wdev91.eclipse.copyright.xml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<project>
3+
<owner></owner>
4+
<copyright><![CDATA[Licensed to the Apache Software Foundation (ASF) under one or more contributor
5+
license agreements. See the NOTICE file distributed with this work for additional
6+
information regarding copyright ownership. The ASF licenses this file to you under
7+
the Apache License, Version 2.0 (the "License"); you may not use this file except
8+
in compliance with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software distributed
13+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
14+
CONDITIONS OF ANY KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations under the License.]]></copyright>
16+
<header contentId="org.eclipse.pde.compositeCheatSheet" excluded="true" />
17+
<header contentId="org.eclipse.egit.contenttype.gitignore" excluded="true" />
18+
<header contentId="org.eclipse.pde.fragmentManifest" excluded="true" />
19+
<header contentId="org.eclipse.ltk.core.refactoring.refactoringIndex" excluded="true" />
20+
<header contentId="org.eclipse.ui.views.log.log" excluded="true" />
21+
<header contentId="org.eclipse.pde.bundleManifest" excluded="true" />
22+
<header contentId="org.eclipse.egit.patch" excluded="true" />
23+
<header contentId="org.eclipse.pde.targetFile" excluded="true" />
24+
<header contentId="org.eclipse.core.runtime.xml" excluded="true" />
25+
<header contentId="org.eclipse.pde.simpleCheatSheet" excluded="true" />
26+
<header contentId="org.eclipse.pde.siteManifest" excluded="true" />
27+
<header contentId="org.eclipse.pde.buildProperties" excluded="true" />
28+
<header contentId="org.eclipse.pde.categoryManifest" excluded="true" />
29+
<header contentId="org.eclipse.pde.ctxHelpFile" excluded="true" />
30+
<header contentId="org.eclipse.jdt.core.javaProperties" excluded="true" />
31+
<header contentId="org.eclipse.jdt.core.JARManifest" excluded="true" />
32+
<header contentId="org.eclipse.pde.pluginProperties" excluded="true" />
33+
<header contentId="org.eclipse.core.resources.preferences" excluded="true" />
34+
<header contentId="org.eclipse.team.genericeditor.diff.extension.patch" excluded="true" />
35+
<header contentId="org.eclipse.pde.featureManifest" excluded="true" />
36+
<header contentId="org.eclipse.pde.tocFile" excluded="true" />
37+
<header contentId="org.eclipse.ant.core.antBuildFile" excluded="true" />
38+
<header contentId="org.eclipse.pde.schema" excluded="true" />
39+
<header contentId="org.eclipse.pde.productFile" excluded="true" />
40+
<header contentId="org.eclipse.ltk.core.refactoring.refactoringHistory" excluded="true" />
41+
<header contentId="org.eclipse.jdt.core.javaSource" postBlankLines="1" lineFormat="false" preserveFirstLine="false">
42+
<beginLine><![CDATA[/*]]></beginLine>
43+
<linePrefix><![CDATA[ * ]]></linePrefix>
44+
<endLine><![CDATA[ */]]></endLine>
45+
</header>
46+
<header contentId="org.eclipse.pde.pluginManifest" excluded="true" />
47+
<header contentId="org.eclipse.core.runtime.text" postBlankLines="0" lineFormat="true" preserveFirstLine="false">
48+
<beginLine><![CDATA[#-------------------------------------------------------------------------------]]></beginLine>
49+
<linePrefix><![CDATA[# ]]></linePrefix>
50+
<endLine><![CDATA[#-------------------------------------------------------------------------------]]></endLine>
51+
</header>
52+
</project>

‎.settings/org.eclipse.jdt.core.prefs

+14
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
1616
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1717
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1818
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
19+
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
1920
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
2021
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
2122
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -39,12 +40,25 @@ org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
3940
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
4041
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
4142
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
43+
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
44+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
45+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
46+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
47+
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
4248
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
4349
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
4450
org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
4551
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
4652
org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
4753
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
54+
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
55+
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
56+
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
57+
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
58+
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
59+
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
60+
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
61+
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
4862
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
4963
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
5064
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore

‎LICENSE

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -174,3 +175,28 @@
174175
of your accepting any such warranty or additional liability.
175176

176177
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎NOTICE

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Copyright 2012 and onward Greg Arakelian
2+
3+
This product includes software developed by Greg Arakelian (http://www.arakelian.com/).
4+

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ plugins {
1414
id 'idea'
1515

1616
// keep dependencies up-to-date!
17-
id 'com.github.ben-manes.versions' version '0.15.0'
17+
id 'com.github.ben-manes.versions' version '0.17.0'
1818

1919
// useful for creating immutable java beans
2020
id 'org.inferred.processors' version '1.2.15'
2121

2222
// to ensure clean code
23-
id "net.ltgt.errorprone" version "0.0.12"
23+
id "net.ltgt.errorprone" version "0.0.13"
2424

2525
// for deployment to Maven Central
2626
id "io.codearte.nexus-staging" version "0.11.0"
@@ -35,7 +35,7 @@ dependencies {
3535
processor 'org.immutables:value:2.5.6'
3636

3737
compile 'junit:junit:4.12'
38-
compile 'com.spotify:docker-client:8.9.1'
38+
compile 'com.spotify:docker-client:8.9.2'
3939

4040
// need 2.22.2+ to fix bug which prevents jersey from exiting
4141
// see: https://github.com/spotify/docker-client/issues/405

‎gradle/core.gradle

+36-33
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Note: There is probably easier way to do this, maybe a Gradle plugin, but still learning Gradle.
33

44
task wrapper(type: Wrapper) {
5-
gradleVersion = '3.5'
5+
gradleVersion = '4.3.1'
66
}
77

88
tasks.withType(JavaCompile) {
@@ -27,8 +27,8 @@ ext {
2727

2828
// useful shortcuts
2929
buildAliases = [
30-
'all' : ['clean', 'classpath', 'build', 'install'],
31-
'deploy' : ['upload', 'closeAndReleaseRepository']
30+
'all' : ['clean', 'classpath', 'build', 'install'],
31+
'deploy' : ['upload', 'closeAndReleaseRepository']
3232
]
3333
}
3434

@@ -127,15 +127,15 @@ eclipse {
127127
new File("${projectDir}/..").eachDir {
128128
if(new File("${it}/build.gradle").exists()) {
129129
use_eclipse_project_refs += it.name
130-
}
130+
}
131131
}
132132

133133
println 'Generating Eclipse .classpath file'
134134
def kindOrder = [ 'src':1, 'con':2, 'lib':3, 'output':0 ];
135135
classpath.entries.sort(true, { a,b ->
136-
def order = kindOrder[a.kind] <=> kindOrder[b.kind]
137-
order != 0 ? order : a.path <=> b.path
138-
} as Comparator).each { entry ->
136+
def order = kindOrder[a.kind] <=> kindOrder[b.kind]
137+
order != 0 ? order : a.path <=> b.path
138+
} as Comparator).each { entry ->
139139
if(entry.kind.equals('lib')) {
140140
use_eclipse_project_refs.each { name ->
141141
def regex = '/(' + ( name.endsWith('-') ?
@@ -200,9 +200,12 @@ if (project.hasProperty('nexusUsername')) {
200200
sign configurations.archives
201201
}
202202

203-
// note: nexus credentials are typically kept in ~/.gradle/gradle.properties
203+
// note: nexus credentials are typically kept in ~/.gradle/gradle.properties
204204
uploadArchives {
205205
repositories {
206+
// deploy locally
207+
mavenLocal()
208+
206209
// see: http://central.sonatype.org/pages/gradle.html
207210
mavenDeployer {
208211
beforeDeployment {
@@ -254,31 +257,31 @@ if (project.hasProperty('nexusUsername')) {
254257
// after this command, we're ready to tag the release
255258

256259
task updateReadme() {
257-
doLast {
258-
def nextVersion = project.version
259-
if(project.version.endsWith('-SNAPSHOT')) {
260-
// after committing the README file the project version will not have SNAPSHOT on it
261-
nextVersion = project.version.substring(0, project.version.length() -'-SNAPSHOT'.length())
262-
}
263-
264-
def file = new File('README.md')
265-
def text = file.text
266-
println "Updating README to reference version " + nextVersion
267-
file.withWriter { w ->
268-
w << text.replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+(-SNAPSHOT)?", nextVersion)
269-
}
270-
271-
def uncommitted = 'git status README.md --porcelain'.execute().text.trim()
272-
if(uncommitted) {
273-
// commit change to README
274-
def cmd = ['git','commit','-m','Update README to version ' + nextVersion,'README.md']
275-
def process = new ProcessBuilder(cmd).redirectErrorStream(true).start()
276-
process.waitFor()
277-
println process.text
278-
} else {
279-
println "No changes made to README"
280-
}
281-
}
260+
doLast {
261+
def nextVersion = project.version
262+
if(project.version.endsWith('-SNAPSHOT')) {
263+
// after committing the README file the project version will not have SNAPSHOT on it
264+
nextVersion = project.version.substring(0, project.version.length() -'-SNAPSHOT'.length())
265+
}
266+
267+
def file = new File('README.md')
268+
def text = file.text
269+
println "Updating README to reference version " + nextVersion
270+
file.withWriter { w ->
271+
w << text.replaceAll("[0-9]+\\.[0-9]+\\.[0-9]+(-SNAPSHOT)?", nextVersion)
272+
}
273+
274+
def uncommitted = 'git status README.md --porcelain'.execute().text.trim()
275+
if(uncommitted) {
276+
// commit change to README
277+
def cmd = ['git','commit','-m','Update README to version ' + nextVersion,'README.md']
278+
def process = new ProcessBuilder(cmd).redirectErrorStream(true).start()
279+
process.waitFor()
280+
println process.text
281+
} else {
282+
println "No changes made to README"
283+
}
284+
}
282285
}
283286

284287
// when we tag a release use project version as tag comment

‎gradle/wrapper/gradle-wrapper.jar

23 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip

‎src/main/java/com/arakelian/docker/junit/DockerConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* @author Greg Arakelian
2828
*/
2929
@Value.Immutable(copy = false)
30-
@Value.Style(get = { "is*", "get*" })
3130
public interface DockerConfig {
3231
public String getImage();
3332

‎src/main/java/com/arakelian/docker/junit/package-info.java

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-2017 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
@Value.Style(get = { "is*", "get*" })
18+
package com.arakelian.docker.junit;
19+
20+
import org.immutables.value.Value;

0 commit comments

Comments
 (0)