Skip to content

Commit 3b57e7e

Browse files
ic0nsic0ns
committed
Merge origin/master into fuzzer
2 parents 1ac67d3 + ae4bbd2 commit 3b57e7e

File tree

99 files changed

+603
-598
lines changed

Some content is hidden

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

99 files changed

+603
-598
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ buildNumber.properties
99
.mvn/timing.properties
1010
/nbproject/
1111
*.idea/
12-
ModifiableVariable.iml
12+
ModifiableVariable.iml

‎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
@@ -121,9 +121,9 @@
121121
</configuration>
122122
</plugin>
123123
<plugin>
124-
<groupId>net.revelc.code</groupId>
124+
<groupId>net.revelc.code.formatter</groupId>
125125
<artifactId>formatter-maven-plugin</artifactId>
126-
<version>0.5.2</version>
126+
<version>2.14.0</version>
127127
<configuration>
128128
<configFile>maven-eclipse-codestyle.xml</configFile>
129129
</configuration>
@@ -136,6 +136,36 @@
136136
</execution>
137137
</executions>
138138
</plugin>
139+
<plugin>
140+
<groupId>com.mycila</groupId>
141+
<artifactId>license-maven-plugin</artifactId>
142+
<configuration>
143+
<header>license_header_plain.txt</header>
144+
<strictCheck>true</strictCheck>
145+
<includes>
146+
<include>src/**/*.java</include>
147+
</includes>
148+
<properties>
149+
<startYear>2014</startYear>
150+
<year>${buildYear}</year>
151+
<description>A Variable Concept for Runtime Modifications</description>
152+
<owner>Ruhr University Bochum, Paderborn University, Hackmanit GmbH</owner>
153+
<licenseName>Apache License, Version 2.0</licenseName>
154+
<licenseURL>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseURL>
155+
</properties>
156+
<mapping>
157+
<java>JAVADOC_STYLE</java>
158+
</mapping>
159+
</configuration>
160+
<executions>
161+
<execution>
162+
<phase>process-sources</phase>
163+
<goals>
164+
<goal>format</goal>
165+
</goals>
166+
</execution>
167+
</executions>
168+
</plugin>
139169
<plugin>
140170
<groupId>org.apache.maven.plugins</groupId>
141171
<artifactId>maven-enforcer-plugin</artifactId>
@@ -230,6 +260,8 @@
230260
</build>
231261

232262
<properties>
263+
<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
264+
<buildYear>${maven.build.timestamp}</buildYear>
233265
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
234266
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
235267
<!-- 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: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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;
1111

1212
import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
1313
import de.rub.nds.modifiablevariable.biginteger.BigIntegerExplicitValueModification;
1414
import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
15+
import de.rub.nds.modifiablevariable.biginteger.BigIntegerMultiplyModification;
1516
import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftLeftModification;
1617
import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
1718
import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
@@ -64,15 +65,14 @@
6465
@XmlAccessorType(XmlAccessType.FIELD)
6566
public abstract class ModifiableVariable<E> implements Serializable {
6667

67-
protected Boolean autoformat = null;
68-
6968
@XmlElements(value = { @XmlElement(type = BigIntegerXorModification.class, name = "BigIntegerXorModification"),
7069
@XmlElement(type = BigIntegerSubtractModification.class, name = "BigIntegerSubtractModification"),
7170
@XmlElement(type = BigIntegerShiftRightModification.class, name = "BigIntegerShiftRightModification"),
7271
@XmlElement(type = BigIntegerShiftLeftModification.class, name = "BigIntegerShiftLeftModification"),
7372
@XmlElement(type = BigIntegerExplicitValueModification.class, name = "BigIntegerExplicitValueModification"),
7473
@XmlElement(type = BigIntegerAddModification.class, name = "BigIntegerAddModification"),
7574
@XmlElement(type = BigIntegerInteractiveModification.class, name = "BigIntegerInteractiveModification"),
75+
@XmlElement(type = BigIntegerMultiplyModification.class, name = "BigIntegerMultiplyModification"),
7676
@XmlElement(type = BooleanToggleModification.class, name = "BooleanToggleModification"),
7777
@XmlElement(type = BooleanExplicitValueModification.class, name = "BooleanExplicitValueModification"),
7878
@XmlElement(type = ByteArrayXorModification.class, name = "ByteArrayXorModification"),
@@ -107,14 +107,6 @@ public ModifiableVariable() {
107107

108108
}
109109

110-
public Boolean getAutoformat() {
111-
return autoformat;
112-
}
113-
114-
public void setAutoformat(Boolean autoformat) {
115-
this.autoformat = autoformat;
116-
}
117-
118110
public void setModification(VariableModification<E> modification) {
119111
this.modification = modification;
120112
}

‎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;

0 commit comments

Comments
 (0)