Skip to content

Commit

Permalink
A lot of changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alaponin
alaponin committed Mar 17, 2017
1 parent 0ee8bb7 commit 586a9c0
Show file tree
Hide file tree
Showing 36 changed files with 2,206 additions and 1,471 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,5 @@ synccomparison
IncompatibilityDetector.java
DifferenceResult.java
TransitionPair.java
target
target
removed_tests
53 changes: 53 additions & 0 deletions .idea/artifacts/PNAutomataConverter_jar.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 30 additions & 29 deletions PNAutomataConverter.iml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
Expand Down Expand Up @@ -102,6 +102,32 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" name="Maven: eu.fbk.shell:jautomata-core:05.2015-snapshot" level="project" />
<orderEntry type="library" name="Maven: org.easytesting:fest-assert:1.4" level="project" />
<orderEntry type="library" name="Maven: org.easytesting:fest-util:1.1.6" level="project" />
Expand Down Expand Up @@ -132,41 +158,16 @@
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.collections:collections-generic:4.01" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.0.0-M2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.0.0-M1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.0.0-M2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.codehaus.groovy:groovy-all:2.4.7" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.spockframework:spock-core:1.0-groovy-2.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:3.2.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.4" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/PNAnalysis.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/lib/org/processmining/TransitionSystems.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.8.1" level="project" />
</component>
</module>
99 changes: 83 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<packaging>jar</packaging>

<groupId>eu.fbk.laponin</groupId>
<artifactId>pn-automata-converter</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<java.version>1.7</java.version>
<junit.version>4.12</junit.version>
<junit.jupiter.version>5.0.0-M2</junit.jupiter.version>
<junit.vintage.version>${junit.version}.0-M2</junit.vintage.version>
Expand Down Expand Up @@ -69,6 +71,69 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.10</version>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<!-- DO NOT include log4j.properties file in your Jar -->
<excludes>
<exclude>**/log4j.properties</exclude>
</excludes>
<archive>
<manifest>
<!-- Jar file entry point -->
<mainClass>converter.Main</mainClass>
</manifest>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/log4j.properties</exclude>
</excludes>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>converter.Main</mainClass>
<classpathPrefix>dependency-jars/</classpathPrefix>
</manifest>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<outputDirectory>${project.build.directory}/dependency-jars/</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -102,7 +167,12 @@
<version>1.9.3</version>
</dependency>


<!-- https://mvnrepository.com/artifact/net.sourceforge.collections/collections-generic -->
<dependency>
<groupId>net.sourceforge.collections</groupId>
<artifactId>collections-generic</artifactId>
<version>4.01</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
<dependency>
Expand All @@ -124,20 +194,6 @@
<scope>test</scope>
</dependency>

<!-- Spock Framework basic dependencies: -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<!-- The version have to be compatible with Groovy -->
<version>1.0-groovy-2.4</version>
<scope>test</scope>
</dependency>
<!-- To use Hamcrest matchers: -->
<dependency>
<groupId>org.hamcrest</groupId>
Expand All @@ -159,6 +215,17 @@
<version>2.4</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8.1</version>
</dependency>
</dependencies>

<repositories>
Expand Down
4 changes: 4 additions & 0 deletions src/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Manifest-Version: 1.0
Main-Class: converter.Main
Class-Path: dependency-jars/log4j-api-2.8.1.jar dependency-jars/log4j-core-2.8.1.jar

Loading

0 comments on commit 586a9c0

Please sign in to comment.