Skip to content

Commit

Permalink
Merge pull request #201 from Open-MBEE/release/4.3.2
Browse files Browse the repository at this point in the history
Release/4.3.2

This backports the build error fix from #196 onto the 4.3.1 code to allow downstream builds to function.
  • Loading branch information
paulgaspardo authored Apr 9, 2021
2 parents 237ad84 + ec5492f commit 1ee0a17
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
13 changes: 9 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ String[] classpathLibraries = ['lib/patch.jar', 'lib/brand.jar', 'lib/brand_api.

buildscript {
repositories {
jcenter()
mavenCentral()
maven {
url 'https://plugins.gradle.org/m2/'
}
}
dependencies {
classpath group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.9.0'
Expand All @@ -39,7 +42,10 @@ apply plugin: 'rebel'

// In this section you declare where to find the dependencies of your project
repositories {
// mavenCentral()
mavenCentral()
maven {
url 'https://repo.gradle.org/gradle/libs-releases-local/'
}
if (buildAccess == 'internal') {
maven {
url 'https://cae-artifactory.jpl.nasa.gov/artifactory/maven-libs-snapshot-virtual'
Expand All @@ -65,7 +71,6 @@ repositories {
}
}
}
jcenter()
}

configurations {
Expand Down Expand Up @@ -143,7 +148,7 @@ dependencies {
// Other dependencies we're unable to resolve via standard repositories

if (buildAccess == 'internal') {
preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.3.1', classifier: 'linux', ext: 'zip'
preCompile group: 'gov.nasa.jpl.cae.nomagic', name: 'cae-cameo-systems-modeler-core', version: '4.3.2', classifier: 'linux', ext: 'zip'
}
else {
preCompile group: 'com.nomagic', name: 'demomagicdraw', version: '190sp3', classifier: 'MagicDraw_Demo_190_sp3_no_install', ext: 'zip'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=4.3.1
version=4.3.2
group=org.openmbee.magicdraw.mdk
descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk
Expand Down

0 comments on commit 1ee0a17

Please sign in to comment.