Skip to content

Commit 4edcb42

Browse files
AlexanderSchultheissAlexanderSchultheiss
authored
Merge pull request #2 from VariantSync/develop
Merging develop into master
2 parents 482adea + af7a7c1 commit 4edcb42

242 files changed

Lines changed: 99936 additions & 106 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.

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@
66
.settings/
77
build.properties
88

9+
temporary-test-repos/
10+
911
target/
1012
bin/
13+
./data/
1114
__pycache__
1215

1316
*/latex/*.aux
1417
*/latex/*.bbl
1518
*/latex/*.blg
1619
*/latex/*.log
1720
*/latex/*.out
18-
*/latex/*.synctex.gz
21+
*/latex/*.synctex.gz
22+
23+
/src/test/resources/variantgeneration/gen/

‎README.md‎

Lines changed: 210 additions & 70 deletions
Large diffs are not rendered by default.

‎docs/generation.png‎

407 KB
Loading

‎maven-scripts/build-local-repo.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
mvn install:install-file \
2+
-DlocalRepositoryPath=../repo \
3+
-Dfile=../src/main/resources/lib/de.ovgu.featureide.lib.fm-v3.8.1.jar \
4+
-DgroupId=de.ovgu \
5+
-DartifactId=featureide.lib.fm \
6+
-Dversion=3.8.1 \
7+
-Dpackaging=jar \
8+
-DgeneratePom=true
9+
10+
mvn install:install-file \
11+
-DlocalRepositoryPath=../repo \
12+
-Dfile=../src/main/resources/lib/Functjonal-1.0-SNAPSHOT.jar \
13+
-DgroupId=vevos \
14+
-DartifactId=functjonal \
15+
-Dversion=1.0.0 \
16+
-Dpackaging=jar \
17+
-DgeneratePom=true
18+
19+
mvn install:install-file \
20+
-DlocalRepositoryPath=../repo \
21+
-Dfile=../src/main/resources/lib/kernel_haven-1.0.0.jar \
22+
-DgroupId=net.ssehub \
23+
-DartifactId=kernel_haven \
24+
-Dversion=1.0.0 \
25+
-Dpackaging=jar \
26+
-DgeneratePom=true
27+
28+
mvn install:install-file \
29+
-DlocalRepositoryPath=../repo \
30+
-Dfile=../src/main/resources/lib/kconfigreader-1.0.0.jar \
31+
-DgroupId=net.ssehub.kernelhaven \
32+
-DartifactId=kconfigreader \
33+
-Dversion=1.0.0 \
34+
-Dpackaging=jar \
35+
-DgeneratePom=true
36+
37+
mvn install:install-file \
38+
-DlocalRepositoryPath=../repo \
39+
-Dfile=../src/main/resources/lib/org.sat4j.core.jar \
40+
-DgroupId=org.sat4j \
41+
-DartifactId=core \
42+
-Dversion=2.3.5 \
43+
-Dpackaging=jar \
44+
-DgeneratePom=true

‎pom.xml‎

Lines changed: 66 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,28 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<!-- Adjust group id for anonymous projects -->
8-
<groupId>de.hub.mse</groupId>
9-
<!-- Adjust the project name -->
10-
<artifactId>MyProject</artifactId>
11-
<version>0.0.1</version>
8+
<groupId>vevos</groupId>
9+
<!-- Adjust the generateVariant name -->
10+
<artifactId>Simulation</artifactId>
11+
<version>1.0.0</version>
1212

1313
<properties>
1414
<!-- Adjust your java version here -->
15-
<java.version>15</java.version>
16-
<!-- Adjust the path to the class that contains the main-method, that is to be executed, here -->
17-
<path.to.main>${groupId}.MyMainClass</path.to.main>
15+
<java.version>16</java.version>
1816
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1917
<maven.compiler.source>${java.version}</maven.compiler.source>
2018
<maven.compiler.target>${java.version}</maven.compiler.target>
2119
<maven.compiler.release>${java.version}</maven.compiler.release>
2220
<junit.jupiter.version>5.6.0</junit.jupiter.version>
2321
</properties>
2422

23+
<repositories>
24+
<repository>
25+
<id>repo</id>
26+
<url>file://${project.basedir}/repo</url>
27+
</repository>
28+
</repositories>
29+
2530
<build>
2631
<plugins>
2732
<plugin>
@@ -37,13 +42,6 @@
3742
<groupId>org.apache.maven.plugins</groupId>
3843
<artifactId>maven-jar-plugin</artifactId>
3944
<version>3.2.0</version>
40-
<configuration>
41-
<archive>
42-
<manifest>
43-
<mainClass>${path.to.main}</mainClass>
44-
</manifest>
45-
</archive>
46-
</configuration>
4745
</plugin>
4846
<plugin>
4947
<artifactId>maven-assembly-plugin</artifactId>
@@ -56,38 +54,71 @@
5654
</execution>
5755
</executions>
5856
<configuration>
59-
<archive>
60-
<manifest>
61-
<mainClass>${path.to.main}</mainClass>
62-
</manifest>
63-
</archive>
6457
<descriptorRefs>
6558
<descriptorRef>jar-with-dependencies</descriptorRef>
6659
</descriptorRefs>
6760
</configuration>
6861
</plugin>
69-
<plugin>
70-
<artifactId>maven-surefire-plugin</artifactId>
71-
<version>2.22.2</version>
72-
</plugin>
7362
</plugins>
7463
</build>
7564

76-
<!-- IN CASE YOU NEED ANY LOCAL LIBS
77-
<repositories>
78-
<repository>
79-
<id>local-maven-repo</id>
80-
<url>file:///${project.basedir}/local-maven-repo</url>
81-
</repository>
82-
</repositories>
83-
-->
84-
8565
<dependencies>
66+
<!-- Local dependencies-->
67+
<dependency>
68+
<groupId>vevos</groupId>
69+
<artifactId>functjonal</artifactId>
70+
<version>1.0.0</version>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>de.ovgu</groupId>
75+
<artifactId>featureide.lib.fm</artifactId>
76+
<version>3.8.1</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>org.sat4j</groupId>
81+
<artifactId>core</artifactId>
82+
<version>2.3.5</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>net.ssehub</groupId>
87+
<artifactId>kernel_haven</artifactId>
88+
<version>1.0.0</version>
89+
</dependency>
90+
91+
<dependency>
92+
<groupId>net.ssehub.kernelhaven</groupId>
93+
<artifactId>kconfigreader</artifactId>
94+
<version>1.0.0</version>
95+
</dependency>
96+
<!-- -->
97+
8698
<dependency>
87-
<groupId>org.junit.jupiter</groupId>
88-
<artifactId>junit-jupiter</artifactId>
89-
<version>${junit.jupiter.version}</version>
99+
<groupId>junit</groupId>
100+
<artifactId>junit</artifactId>
101+
<version>4.11</version>
90102
<scope>test</scope>
91103
</dependency>
104+
105+
<dependency>
106+
<groupId>org.eclipse.jgit</groupId>
107+
<artifactId>org.eclipse.jgit</artifactId>
108+
<version>5.11.1.202105131744-r</version>
109+
</dependency>
110+
111+
<dependency>
112+
<groupId>org.jetbrains</groupId>
113+
<artifactId>annotations</artifactId>
114+
<version>21.0.1</version>
115+
<scope>compile</scope>
116+
</dependency>
117+
118+
<dependency>
119+
<groupId>net.lingala.zip4j</groupId>
120+
<artifactId>zip4j</artifactId>
121+
<version>2.9.0</version>
122+
</dependency>
92123
</dependencies>
93124
</project>

‎repo/de/ovgu/featureide.lib.fm/3.8.1/featureide.lib.fm-3.8.1.jar‎

1.76 MB
Binary file not shown.

‎repo/de/ovgu/featureide.lib.fm/3.8.1/featureide.lib.fm-3.8.1.pom‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>de.ovgu</groupId>
6+
<artifactId>featureide.lib.fm</artifactId>
7+
<version>3.8.1</version>
8+
<description>POM was created from install:install-file</description>
9+
</project>

‎repo/de/ovgu/featureide.lib.fm/maven-metadata-local.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata>
3+
<groupId>de.ovgu</groupId>
4+
<artifactId>featureide.lib.fm</artifactId>
5+
<versioning>
6+
<release>3.8.1</release>
7+
<versions>
8+
<version>3.8.1</version>
9+
</versions>
10+
<lastUpdated>20220205170510</lastUpdated>
11+
</versioning>
12+
</metadata>

‎repo/net/ssehub/kernel_haven/1.0.0/kernel_haven-1.0.0.jar‎

652 KB
Binary file not shown.

‎repo/net/ssehub/kernel_haven/1.0.0/kernel_haven-1.0.0.pom‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>net.ssehub</groupId>
6+
<artifactId>kernel_haven</artifactId>
7+
<version>1.0.0</version>
8+
<description>POM was created from install:install-file</description>
9+
</project>

0 commit comments

Comments
 (0)