Skip to content

Commit 9733a6c

Browse files
ic0nsic0ns
authored
Merge pull request #51 from tls-attacker/UpdateFormatterAndLicenseHeader
Update formatter and license header
2 parents 62dee58 + c989e21 commit 9733a6c

File tree

97 files changed

+507
-586
lines changed

Some content is hidden

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

97 files changed

+507
-586
lines changed

‎license_header.txt‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎license_header_plain.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ModifiableVariable - A Variable Concept for Runtime Modifications
1+
${project.name} - ${description}
22

3-
Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
3+
Copyright ${startYear}-${year} ${owner}
44

5-
Licensed under Apache License 2.0
6-
http://www.apache.org/licenses/LICENSE-2.0
5+
Licensed under ${licenseName}
6+
${licenseURL}

‎pom.xml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
</configuration>
116116
</plugin>
117117
<plugin>
118-
<groupId>net.revelc.code</groupId>
118+
<groupId>net.revelc.code.formatter</groupId>
119119
<artifactId>formatter-maven-plugin</artifactId>
120-
<version>0.5.2</version>
120+
<version>2.14.0</version>
121121
<configuration>
122122
<configFile>maven-eclipse-codestyle.xml</configFile>
123123
</configuration>
@@ -130,6 +130,36 @@
130130
</execution>
131131
</executions>
132132
</plugin>
133+
<plugin>
134+
<groupId>com.mycila</groupId>
135+
<artifactId>license-maven-plugin</artifactId>
136+
<configuration>
137+
<header>license_header_plain.txt</header>
138+
<strictCheck>true</strictCheck>
139+
<includes>
140+
<include>src/**/*.java</include>
141+
</includes>
142+
<properties>
143+
<startYear>2014</startYear>
144+
<year>${buildYear}</year>
145+
<description>A Variable Concept for Runtime Modifications</description>
146+
<owner>Ruhr University Bochum, Paderborn University, Hackmanit GmbH</owner>
147+
<licenseName>Apache License, Version 2.0</licenseName>
148+
<licenseURL>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseURL>
149+
</properties>
150+
<mapping>
151+
<java>JAVADOC_STYLE</java>
152+
</mapping>
153+
</configuration>
154+
<executions>
155+
<execution>
156+
<phase>process-sources</phase>
157+
<goals>
158+
<goal>format</goal>
159+
</goals>
160+
</execution>
161+
</executions>
162+
</plugin>
133163
<plugin>
134164
<groupId>org.apache.maven.plugins</groupId>
135165
<artifactId>maven-enforcer-plugin</artifactId>
@@ -224,6 +254,8 @@
224254
</build>
225255

226256
<properties>
257+
<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
258+
<buildYear>${maven.build.timestamp}</buildYear>
227259
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
228260
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
229261
<!-- We redefine the signature generation process, which is enabled by default,

‎src/main/java/de/rub/nds/modifiablevariable/FileConfigurationException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/HoldsModifiableVariable.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/ModifiableVariable.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/ModifiableVariableFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/ModifiableVariableProperty.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/ModificationFilter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;

‎src/main/java/de/rub/nds/modifiablevariable/VariableModification.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* ModifiableVariable - A Variable Concept for Runtime Modifications
33
*
4-
* Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
4+
* Copyright 2014-2021 Ruhr University Bochum, Paderborn University, Hackmanit GmbH
55
*
6-
* Licensed under Apache License 2.0
7-
* http://www.apache.org/licenses/LICENSE-2.0
6+
* Licensed under Apache License, Version 2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0.txt
88
*/
99

1010
package de.rub.nds.modifiablevariable;
@@ -54,7 +54,7 @@ public E modify(E input) {
5454
* Debugging modified variables. Getting stack trace can be time consuming, thus we use isDebugEnabled() function
5555
*
5656
* @param value
57-
* variable modification that is going to be debugged
57+
* variable modification that is going to be debugged
5858
*/
5959
protected void debug(E value) {
6060
if (LOGGER.isDebugEnabled()) {

0 commit comments

Comments
 (0)