Skip to content

Commit 6bbcdb0

Browse files
committed
Simplifying POM and updating copyrights year
1 parent 5a54b9f commit 6bbcdb0

File tree

58 files changed

+127
-75
lines changed

Some content is hidden

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

58 files changed

+127
-75
lines changed

pom.xml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
35
<modelVersion>4.0.0</modelVersion>
46

57
<groupId>net.tascalate</groupId>
@@ -38,12 +40,6 @@
3840

3941
<dependencyManagement>
4042
<dependencies>
41-
<dependency>
42-
<groupId>commons-logging</groupId>
43-
<artifactId>commons-logging</artifactId>
44-
<version>1.2</version>
45-
</dependency>
46-
4743
<dependency>
4844
<groupId>junit</groupId>
4945
<artifactId>junit</artifactId>
@@ -86,7 +82,7 @@
8682
<plugin>
8783
<groupId>org.apache.maven.plugins</groupId>
8884
<artifactId>maven-javadoc-plugin</artifactId>
89-
<version>2.10.4</version>
85+
<version>3.0.1</version>
9086
<executions>
9187
<execution>
9288
<id>attach-javadocs</id>
@@ -160,21 +156,34 @@
160156
<plugin>
161157
<groupId>org.apache.maven.plugins</groupId>
162158
<artifactId>maven-compiler-plugin</artifactId>
163-
<version>3.6.1</version>
159+
<version>3.8.0</version>
160+
<executions>
161+
<execution>
162+
<id>default-compile</id>
163+
<goals>
164+
<goal>compile</goal>
165+
</goals>
166+
<configuration>
167+
<excludes>
168+
<exclude>module-info.java</exclude>
169+
</excludes>
170+
</configuration>
171+
</execution>
172+
</executions>
164173
<configuration>
165174
<source>1.8</source>
166175
<target>1.8</target>
167176
</configuration>
168177
</plugin>
169178
<plugin>
170179
<groupId>org.apache.maven.plugins</groupId>
171-
<artifactId>maven-assembly-plugin</artifactId>
172-
<version>3.0.0</version>
180+
<artifactId>maven-jar-plugin</artifactId>
181+
<version>3.1.1</version>
173182
</plugin>
174183
<plugin>
175184
<groupId>org.apache.maven.plugins</groupId>
176185
<artifactId>maven-surefire-plugin</artifactId>
177-
<version>2.19.1</version>
186+
<version>2.22.1</version>
178187
<configuration>
179188
<includes>
180189
<include>**/*TestSuite.java</include>
@@ -199,19 +208,12 @@
199208
<configuration>
200209
<jvmVersion>9</jvmVersion>
201210
<module>
202-
<moduleInfoSource>
203-
module net.tascalate.concurrent {
204-
exports net.tascalate.concurrent;
205-
exports net.tascalate.concurrent.decorators;
206-
exports net.tascalate.concurrent.delays;
207-
}
208-
</moduleInfoSource>
211+
<moduleInfoFile>src/main/java/module-info.java</moduleInfoFile>
209212
</module>
210213
</configuration>
211214
</execution>
212215
</executions>
213216
</plugin>
214217
</plugins>
215218
</build>
216-
217219
</project>

src/main/java/module-info.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
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+
module net.tascalate.concurrent {
17+
exports net.tascalate.concurrent;
18+
exports net.tascalate.concurrent.decorators;
19+
exports net.tascalate.concurrent.delays;
20+
}

src/main/java/net/tascalate/concurrent/AbstractCompletableTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* under the Apache License, Version 2.0. Please see
77
* https://github.com/lukas-krecan/completion-stage/blob/completion-stage-0.0.9/src/main/java/net/javacrumbs/completionstage/SimpleCompletionStage.java
88
*
9-
* Modified work: copyright 2015-2018 Valery Silaev (http://vsilaev.com)
9+
* Modified work: copyright 2015-2019 Valery Silaev (http://vsilaev.com)
1010
*
1111
* Licensed under the Apache License, Version 2.0 (the "License");
1212
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/AggregatingPromise.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CallbackRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* under the Apache License, Version 2.0. Please see
77
* https://github.com/lukas-krecan/completion-stage/blob/completion-stage-0.0.9/src/main/java/net/javacrumbs/completionstage/CallbackRegistry.java
88
*
9-
* Modified work: copyright 2015-2018 Valery Silaev (http://vsilaev.com)
9+
* Modified work: copyright 2015-2019 Valery Silaev (http://vsilaev.com)
1010
*
1111
* Licensed under the Apache License, Version 2.0 (the "License");
1212
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CompletableFutureWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CompletablePromise.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CompletableSubTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CompletableTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/net/tascalate/concurrent/CompletionStageWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2015-2018 Valery Silaev (http://vsilaev.com)
2+
* Copyright 2015-2019 Valery Silaev (http://vsilaev.com)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)