Skip to content

Commit 0d62e5c

Browse files
Update licence year
1 parent b9eb668 commit 0d62e5c

File tree

70 files changed

+107
-88
lines changed

Some content is hidden

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

70 files changed

+107
-88
lines changed

pom.xml

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
34

45
<modelVersion>4.0.0</modelVersion>
56
<parent>
@@ -48,7 +49,7 @@
4849
<dependency>
4950
<groupId>junit</groupId>
5051
<artifactId>junit</artifactId>
51-
<version>4.11</version><!--$NO-MVN-MAN-VER$-->
52+
<version>4.11</version><!--$NO-MVN-MAN-VER$ -->
5253
<scope>test</scope>
5354
</dependency>
5455

@@ -81,20 +82,39 @@
8182
</configuration>
8283
</plugin>
8384
<plugin>
84-
<groupId>org.apache.maven.plugins</groupId>
85-
<artifactId>maven-javadoc-plugin</artifactId>
86-
<configuration>
87-
<!-- needed to fix javadoc on java 11+ https://github.com/joel-costigliola/assertj-core/issues/1403 -->
88-
<source>8</source>
89-
</configuration>
90-
<executions>
91-
<execution>
92-
<id>attach-javadocs</id>
93-
<goals>
94-
<goal>jar</goal>
95-
</goals>
96-
</execution>
97-
</executions>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-toolchains-plugin</artifactId>
87+
<version>1.1</version>
88+
<executions>
89+
<execution>
90+
<goals>
91+
<goal>toolchain</goal>
92+
</goals>
93+
</execution>
94+
</executions>
95+
<configuration>
96+
<toolchains>
97+
<jdk>
98+
<version>1.8</version>
99+
</jdk>
100+
</toolchains>
101+
</configuration>
102+
</plugin>
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-javadoc-plugin</artifactId>
106+
<configuration>
107+
<!-- needed to fix javadoc on java 11+ https://github.com/joel-costigliola/assertj-core/issues/1403 -->
108+
<source>8</source>
109+
</configuration>
110+
<executions>
111+
<execution>
112+
<id>attach-javadocs</id>
113+
<goals>
114+
<goal>jar</goal>
115+
</goals>
116+
</execution>
117+
</executions>
98118
</plugin>
99119
<plugin>
100120
<groupId>org.apache.maven.plugins</groupId>
@@ -144,7 +164,7 @@
144164
</archive>
145165
</configuration>
146166
</plugin>
147-
<!-- generate jacoco report -->
167+
<!-- generate jacoco report -->
148168
<plugin>
149169
<groupId>org.jacoco</groupId>
150170
<artifactId>jacoco-maven-plugin</artifactId>
@@ -160,8 +180,7 @@
160180
<artifactId>maven-surefire-plugin</artifactId>
161181
<configuration>
162182
<argLine>${argLine}</argLine>
163-
<!-- Needed because otherwise the classloader does not properly bring in the dependencies from
164-
maven. Source: http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
183+
<!-- Needed because otherwise the classloader does not properly bring in the dependencies from maven. Source: http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html -->
165184
<useSystemClassLoader>false</useSystemClassLoader>
166185
</configuration>
167186
</plugin>

src/main/java/org/assertj/assertions/generator/AssertionGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/AssertionsEntryPointGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/AssertionsEntryPointType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/DefaultTemplateRegistryProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/GenerateAssertion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/Template.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
/*
1414
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with

src/main/java/org/assertj/assertions/generator/TemplateRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator;
1414

src/main/java/org/assertj/assertions/generator/cli/AssertionGeneratorLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
99
* specific language governing permissions and limitations under the License.
1010
*
11-
* Copyright 2012-2020 the original author or authors.
11+
* Copyright 2012-2021 the original author or authors.
1212
*/
1313
package org.assertj.assertions.generator.cli;
1414

0 commit comments

Comments
 (0)