From b4001b5720de53bfbb1f9d97c7fb87575f14057d Mon Sep 17 00:00:00 2001
From: Sebastian Krings <sebastian@krin.gs>
Date: Thu, 28 Apr 2016 14:30:02 +0200
Subject: [PATCH] update dependencies to fix build
---
build.gradle | 93 ++++++++++++++-----------------
de.prob.core/.classpath | 18 +++---
de.prob.core/META-INF/MANIFEST.MF | 18 ++++++
de.prob.core/build.gradle | 20 +++----
4 files changed, 79 insertions(+), 70 deletions(-)
diff --git a/build.gradle b/build.gradle
index 348ac261..082d242f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
import org.apache.tools.ant.taskdefs.condition.Os
project.ext{
-
+
targetRepositories = ["http://download.eclipse.org/releases/indigo/",
"http://rodin-b-sharp.sourceforge.net/updates",
"http://rodin-b-sharp.sourceforge.net/core-updates"
@@ -17,47 +17,49 @@ apply from: 'tycho_build.gradle'
// Local tasks
-task bMotionStudioHelpCustumBuild(type: Exec){
-
- commandLine 'ant', '-f','de.bmotionstudio.help/customBuild.xml'
-}
-
-install.dependsOn bMotionStudioHelpCustumBuild
-
-completeInstall.dependsOn bMotionStudioHelpCustumBuild
project(':de.prob.core') {
- repositories {
- maven {
- name "cobra"
- url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
- }
- }
+repositories {
+ mavenCentral()
+ maven {
+ name "snapshots"
+ url "https://oss.sonatype.org/content/repositories/snapshots/"
+ }
+ maven {
+ name "release"
+ url "https://oss.sonatype.org/content/repositories/releases/"
+ }
+}
- def parser_version = '2.4.30-SNAPSHOT'
+ def parser_version = '2.5.6'
dependencies {
- compile group: "de.prob", name: "answerparser", version: parser_version , changing: true
- compile group: "de.prob", name: "bparser", version: parser_version , changing: true
- compile group: "de.prob", name: "cliparser", version: parser_version , changing: true
- compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true
- compile group: "de.prob", name: "parserbase", version: parser_version , changing: true
- compile group: "de.prob", name: "prologlib", version: parser_version , changing: true
- compile group: "de.prob", name: "unicode", version: parser_version , changing: true
- compile group: "de.prob", name: "theorymapping", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "answerparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "bparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "cliparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "ltlparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "parserbase", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "prologlib", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true
compile 'commons-lang:commons-lang:2.6'
}
-
+
}
project(':de.prob.ui') {
- repositories {
- maven {
- name "cobra"
- url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
- }
- }
+repositories {
+ mavenCentral()
+ maven {
+ name "snapshots"
+ url "https://oss.sonatype.org/content/repositories/snapshots/"
+ }
+ maven {
+ name "release"
+ url "https://oss.sonatype.org/content/repositories/releases/"
+ }
+}
dependencies {
compile 'commons-codec:commons-codec:1.6'
}
@@ -74,11 +76,11 @@ def download(address,target) {
task downloadCli << {
def dir = workspacePath+'de.prob.core/prob/'
delete file(dir)
- new File(dir).mkdirs()
-
+ new File(dir).mkdirs()
+
['leopard64':'macos','linux32':'linux','linux64':'linux64','win32':'windows'].each {
def n = it.getKey()
-
+
def targetdir = dir+it.getValue()
def targetzip = dir+"probcli_${n}.zip"
def url = "http://nightly.cobra.cs.uni-duesseldorf.de/cli/probcli_${n}.zip"
@@ -100,20 +102,20 @@ task downloadCli << {
into targetdir
}
delete file(targetzip)
-
+
}
task downloadCli2 ( type: Exec ) {
-
+
def dir = workspacePath+'de.prob.core/prob/'
delete file(dir)
- new File(dir).mkdirs()
-
+ new File(dir).mkdirs()
+
['leopard64':'macos','linux32':'linux','linux64':'linux64','win32':'windows'].each {
def n = it.getKey()
-
+
def targetdir = dir+it.getValue()
def targetzip = dir+"probcli_${n}.zip"
def url = "http://nightly.cobra.cs.uni-duesseldorf.de/cli/probcli_${n}.zip"
@@ -135,18 +137,8 @@ task downloadCli2 ( type: Exec ) {
into targetdir
}
delete file(targetzip)
-
- ['leopard64':'macos','linux32':'linux','linux64':'linux64'].each {
-
- def n = it.getKey()
- targetdir = dir+it.getValue()
- download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-"+n, targetdir+"/cspm" )
- }
- commandLine 'chmod', 'a+x', dir+'linux'+'/cspm', dir+'linux64'+'/cspm', dir+'macos'+'/cspm'
- //commandLine 'chmod', 'a+x', dir+'*'+'/cspm'
-
- download( "http://nightly.cobra.cs.uni-duesseldorf.de/cspm/cspm-windows", dir+"windows"+"/cspm.exe" )
+
}
@@ -165,4 +157,3 @@ task collectArtifacts(type:Copy) {
from workspacePath + "index.html"
into workspacePath + 'updatesite'
}
-
diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath
index 60dc2e91..030f4881 100644
--- a/de.prob.core/.classpath
+++ b/de.prob.core/.classpath
@@ -4,19 +4,19 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.30-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-codec-1.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-lang-2.6.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/jfmi-1.0.2-SNAPSHOT.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/jna-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/jsr305-1.3.9.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/theorymapping-2.4.30-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.4.30-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/ptolemy-jfmi-1.1.1-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/theorymapping-2.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.5.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/xmlpull-1.1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/xpp3_min-1.1.4c.jar"/>
<classpathentry exported="true" kind="lib" path="lib/dependencies/xstream-1.4.7.jar"/>
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 2a7eed24..82d6d738 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -120,6 +120,24 @@ Bundle-Activator: de.prob.core.internal.Activator
Eclipse-BuddyPolicy: registered
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
+ lib/dependencies/unicode-2.5.6.jar,
+ lib/dependencies/unicode-2.5.1.jar,
+ lib/dependencies/theorymapping-2.5.6.jar,
+ lib/dependencies/theorymapping-2.5.1.jar,
+ lib/dependencies/ptolemy-jfmi-1.1.1-SNAPSHOT.jar,
+ lib/dependencies/ptolemy-jfmi-1.1.0.jar,
+ lib/dependencies/prologlib-2.5.6.jar,
+ lib/dependencies/prologlib-2.5.1.jar,
+ lib/dependencies/parserbase-2.5.6.jar,
+ lib/dependencies/parserbase-2.5.1.jar,
+ lib/dependencies/ltlparser-2.5.6.jar,
+ lib/dependencies/ltlparser-2.5.1.jar,
+ lib/dependencies/cliparser-2.5.6.jar,
+ lib/dependencies/cliparser-2.5.1.jar,
+ lib/dependencies/bparser-2.5.6.jar,
+ lib/dependencies/bparser-2.5.1.jar,
+ lib/dependencies/answerparser-2.5.6.jar,
+ lib/dependencies/answerparser-2.5.1.jar,
lib/dependencies/xstream-1.4.7.jar,
lib/dependencies/unicode-2.4.30-SNAPSHOT.jar,
lib/dependencies/theorymapping-2.4.30-SNAPSHOT.jar,
diff --git a/de.prob.core/build.gradle b/de.prob.core/build.gradle
index cddfecca..0275b07c 100644
--- a/de.prob.core/build.gradle
+++ b/de.prob.core/build.gradle
@@ -3,17 +3,17 @@ apply plugin: 'java'
def parser_version = '2.4.18-SNAPSHOT'
dependencies {
- compile group: "de.prob", name: "answerparser", version: parser_version , changing: true
- compile group: "de.prob", name: "bparser", version: parser_version , changing: true
- compile group: "de.prob", name: "cliparser", version: parser_version , changing: true
- compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true
- compile group: "de.prob", name: "parserbase", version: parser_version , changing: true
- compile group: "de.prob", name: "prologlib", version: parser_version , changing: true
- compile group: "de.prob", name: "unicode", version: parser_version , changing: true
- compile group: "de.prob", name: "theorymapping", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "answerparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "bparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "cliparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "ltlparser", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "parserbase", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "prologlib", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true
+ compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true
compile 'commons-lang:commons-lang:2.6'
compile 'commons-codec:commons-codec:1.6'
compile 'com.thoughtworks.xstream:xstream:1.4.7'
compile group: 'net.java.dev.jna', name: 'jna', version: '3.4.0'
- compile group: 'edu.berkeley.eecs.ptolemy', name: 'jfmi', version: '1.0.2-SNAPSHOT'
-}
\ No newline at end of file
+ compile group: 'de.hhu.stups', name: 'ptolemy-jfmi', version: '1.1.1-SNAPSHOT'
+}
--
GitLab