Skip to content

Commit 02ca61d

Browse files
wadoonwadoon
committed
last steps for JPMS
- add SNAPSHOT of dockingframes - removal of JUnit4 from root gradle
1 parent a85a022 commit 02ca61d

284 files changed

Lines changed: 890 additions & 959 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,12 @@ subprojects {
6464

6565
repositories {
6666
mavenCentral()
67-
maven {
67+
maven { // cleary if needed?!
6868
url 'https://git.key-project.org/api/v4/projects/35/packages/maven'
6969
}
70+
maven { // remove if docking frames 1.1.3p2 on Maven Central
71+
url "https://s01.oss.sonatype.org/content/repositories/snapshots/"
72+
}
7073
}
7174

7275
dependencies {
@@ -77,8 +80,6 @@ subprojects {
7780
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
7881
testImplementation project(':key.util')
7982

80-
testCompileOnly 'junit:junit:4.13.2'
81-
testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.10.2'
8283
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
8384

8485
implementation("org.jspecify:jspecify:0.3.0")

‎key.core.example/src/main/java/module-info.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
/**
22
*
3-
* @author Alexander Weigl
3+
* @author Alexander Weigl
44
* @version 1 (31.03.24)
55
*/
66
module org.key_project.core.example {
7+
requires org.key_project.core;
8+
requires org.key_project.util;
9+
requires org.slf4j;
710
}

‎key.core.proof_references/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* @author Alexander Weigl
3+
* @author Alexander Weigl
44
* @version 1 (31.03.24)
55
*/
66
module org.key_project.proof_references {

‎key.core.rifl/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* @author Alexander Weigl
3+
* @author Alexander Weigl
44
* @version 1 (31.03.24)
55
*/
66
module org.key_project.core.rifl {

‎key.core.symbolic_execution.example/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* @author Alexander Weigl
3+
* @author Alexander Weigl
44
* @version 1 (31.03.24)
55
*/
66
module key.core.symbolic_execution.example {

‎key.core.symbolic_execution.example/src/main/java/org/key_project/example/Main.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
import de.uka.ilkd.key.proof.init.AbstractOperationPO;
1818
import de.uka.ilkd.key.settings.ChoiceSettings;
1919
import de.uka.ilkd.key.settings.ProofSettings;
20-
import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator;
21-
import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder;
22-
import de.uka.ilkd.key.symbex.model.IExecutionNode;
23-
import de.uka.ilkd.key.symbex.po.ProgramMethodPO;
24-
import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile;
25-
import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition;
26-
import de.uka.ilkd.key.symbex.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition;
27-
import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition;
28-
import de.uka.ilkd.key.symbex.strategy.breakpoint.ExceptionBreakpoint;
29-
import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint;
30-
import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment;
31-
import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil;
20+
import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator;
21+
import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder;
22+
import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode;
23+
import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPO;
24+
import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile;
25+
import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition;
26+
import de.uka.ilkd.key.symbolic_execution.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition;
27+
import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition;
28+
import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.ExceptionBreakpoint;
29+
import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint;
30+
import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment;
31+
import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
3232
import de.uka.ilkd.key.util.MiscTools;
3333

3434
import org.key_project.util.collection.ImmutableSLList;

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java renamed to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* This file is part of KeY - https://key-project.org
22
* KeY is licensed under the GNU General Public License Version 2
33
* SPDX-License-Identifier: GPL-2.0-only */
4-
package de.uka.ilkd.key.symbex;
4+
package de.uka.ilkd.key.symbolic_execution;
55

66
import java.util.*;
77
import java.util.Map.Entry;
@@ -20,10 +20,10 @@
2020
import de.uka.ilkd.key.proof.mgt.ProofEnvironment;
2121
import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo;
2222
import de.uka.ilkd.key.strategy.StrategyProperties;
23-
import de.uka.ilkd.key.symbex.model.impl.ExecutionAllArrayIndicesVariable;
24-
import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout;
25-
import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil;
26-
import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil;
23+
import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionAllArrayIndicesVariable;
24+
import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout;
25+
import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil;
26+
import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
2727

2828
import org.key_project.logic.Name;
2929
import org.key_project.logic.sort.Sort;

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java renamed to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* This file is part of KeY - https://key-project.org
22
* KeY is licensed under the GNU General Public License Version 2
33
* SPDX-License-Identifier: GPL-2.0-only */
4-
package de.uka.ilkd.key.symbex;
4+
package de.uka.ilkd.key.symbolic_execution;
55

66
import java.util.Map;
77
import java.util.Map.Entry;

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java renamed to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* This file is part of KeY - https://key-project.org
22
* KeY is licensed under the GNU General Public License Version 2
33
* SPDX-License-Identifier: GPL-2.0-only */
4-
package de.uka.ilkd.key.symbex;
4+
package de.uka.ilkd.key.symbolic_execution;
55

6-
import de.uka.ilkd.key.symbex.model.IExecutionNode;
6+
import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode;
77

88
/**
99
* <p>

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java renamed to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* This file is part of KeY - https://key-project.org
22
* KeY is licensed under the GNU General Public License Version 2
33
* SPDX-License-Identifier: GPL-2.0-only */
4-
package de.uka.ilkd.key.symbex;
4+
package de.uka.ilkd.key.symbolic_execution;
55

66
import java.io.File;
77
import java.io.FileInputStream;
@@ -29,10 +29,10 @@
2929
import de.uka.ilkd.key.speclang.BlockContract;
3030
import de.uka.ilkd.key.speclang.Contract;
3131
import de.uka.ilkd.key.speclang.LoopSpecification;
32-
import de.uka.ilkd.key.symbex.model.*;
33-
import de.uka.ilkd.key.symbex.model.IExecutionTermination.TerminationKind;
34-
import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass;
35-
import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout;
32+
import de.uka.ilkd.key.symbolic_execution.model.*;
33+
import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination.TerminationKind;
34+
import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass;
35+
import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout;
3636

3737
import org.key_project.logic.sort.Sort;
3838
import org.key_project.util.collection.ImmutableList;

0 commit comments

Comments
 (0)