Skip to content

Commit

Permalink
Merge pull request joelittlejohn#1095 from ddcruver/feature/update-li…
Browse files Browse the repository at this point in the history
…cense-plugin-to-fix-corrupted-character-before-copyright-symbol

Update license plugin to fix corrupted character before copyright symbol
  • Loading branch information
joelittlejohn authored Apr 6, 2020
2 parents 6831333 + 33fee69 commit 5d33bbc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* limitations under the License.
*/


package org.jsonschema2pojo.integration;

import org.jsonschema2pojo.integration.util.Jsonschema2PojoRule;
Expand Down
14 changes: 14 additions & 0 deletions license-plugin-definition.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<additionalHeaders>
<java_style>
<firstLine>/**</firstLine>
<beforeEachLine> * </beforeEachLine>
<endLine> */EOL</endLine>
<afterEachLine> </afterEachLine>
<firstLineDetectionPattern>(\s|\t)*/\*.*$</firstLineDetectionPattern>
<lastLineDetectionPattern>.*\*/(\s|\t)*$</lastLineDetectionPattern>
<allowBlankLines>false</allowBlankLines>
<isMultiline>true</isMultiline>
<padLines>false</padLines>
</java_style>
</additionalHeaders>
16 changes: 11 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<versionRange>[0.0,)</versionRange>
<goals>
<goal>format</goal>
Expand Down Expand Up @@ -131,9 +131,9 @@
</pluginManagement>
<plugins>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.8.0</version>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>3.0</version>
<configuration>
<aggregate>true</aggregate>
<encoding>UTF-8</encoding>
Expand All @@ -142,10 +142,16 @@
</excludes>
<failIfMissing>true</failIfMissing>
<header>NOTICE</header>
<headerDefinitions>
<headerDefinition>license-plugin-definition.xml</headerDefinition>
</headerDefinitions>
<includes>
<include>**/src/main/java/**</include>
<include>**/src/test/java/**</include>
</includes>
<mapping>
<java>JAVA_STYLE</java>
</mapping>
<skipExistingHeaders>false</skipExistingHeaders>
<strictCheck>true</strictCheck>
</configuration>
Expand Down

0 comments on commit 5d33bbc

Please sign in to comment.