Permalink
Browse files

Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	.gitignore
#	src/main/java/de/uniks/networkparser/HistoryIdMap.java
#	src/main/java/org/sdmlib/models/SDMLibIdMap.java
#	src/main/java/org/sdmlib/models/classes/logic/GenAttribute.java
#	src/main/java/org/sdmlib/models/pattern/IsomorphismComputation.java
#	src/main/java/org/sdmlib/models/pattern/PatternObject.java
#	src/main/java/org/sdmlib/storyboards/GenericIdMap.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/TrainStoryboards.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/Person.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/SignalFlag.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/Station.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/Train.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/PersonPO.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/PersonSet.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/SignalFlagPO.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/SignalFlagSet.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/StationPO.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/StationSet.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/TrainPO.java
#	src/test/java/org/sdmlib/test/examples/patternrewriteops/model/util/TrainSet.java
#	src/test/java/org/sdmlib/test/examples/reachabilitygraphs/ReachbilityGraphSimpleExamples.java
#	src/test/java/org/sdmlib/test/examples/studyright/StudyRightStoryboards.java
  • Loading branch information...
StefanLindel committed Nov 6, 2017
2 parents 432f93f + c3c6dca commit 40d29dfd824e7659f93f331ffb2d6bc9e9d44d2f
Showing 931 changed files with 81,994 additions and 49,637 deletions.
View
@@ -3,6 +3,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/main/replication"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/NetworkParser"/>
View
@@ -14,6 +14,7 @@ atlassian-ide-plugin.xml
/build/
/.idea/
/gen/
/src/test/java/org/sdmlib/simple/model/
*.jar
gradle.properties
*.gpg
View
@@ -63,18 +63,25 @@ repositories {
mavenCentral()
// NetworkParser
if(gitVersion.isMaster() || isTravisSnapshot()) {
maven { url "https://se.cs.uni-kassel.de/artifactory/libs-release-local" }
}else{
maven { url "https://se.cs.uni-kassel.de/artifactory/libs-snapshot-local" }
}
if((gitVersion.isMaster() || isTravisSnapshot())== false) {
maven { url "http://oss.sonatype.org/content/repositories/snapshots" }
}
//if(gitVersion.isMaster() || isTravisSnapshot()) {
// maven { url "https://se.cs.uni-kassel.de/artifactory/libs-release-local" }
//}else{
// maven { url "https://se.cs.uni-kassel.de/artifactory/libs-snapshot-local" }
//}
}
dependencies {
compile group: "junit", name: "junit", version: "4.+"
if ( ! project.hasProperty('useLocalDependencies'))
{
compile 'de.uniks:NetworkParser:[4,):sources'
if((gitVersion.isMaster() || isTravisSnapshot())== false) {
compile group: "de.uniks", name: "NetworkParser", version: "latest.integration", classifier:"sources", changing: true
} else {
compile 'de.uniks:NetworkParser:[4,):sources'
}
}
else
{
Oops, something went wrong.

0 comments on commit 40d29df

Please sign in to comment.