From c997a4eb5187110dd52c660480164a7d526a8733 Mon Sep 17 00:00:00 2001 From: Paul Gaspardo Date: Fri, 19 Mar 2021 09:44:05 -0700 Subject: [PATCH 1/2] Remove JCenter repository This replaces JCenter (which is being sunsetted) with Maven Central and the Gradle Plugins and Releases repositories. The NoMagic and internal repositories are now placed last to avoid hitting NoMagic's server for every dependency and to work around a Gradle bug causing a failure when pulling from the internal repository. --- build.gradle | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 0e3bf979d..f9479668b 100644 --- a/build.gradle +++ b/build.gradle @@ -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' @@ -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' @@ -65,7 +71,6 @@ repositories { } } } - jcenter() } configurations { From ec5492f2342ad6e07326e43dc30e81b7684bb2c1 Mon Sep 17 00:00:00 2001 From: Paul Gaspardo Date: Thu, 8 Apr 2021 16:57:54 -0700 Subject: [PATCH 2/2] Update version to 4.3.2 --- build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f9479668b..3b2320f64 100644 --- a/build.gradle +++ b/build.gradle @@ -148,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' diff --git a/gradle.properties b/gradle.properties index 4de47ab51..c48fe2e80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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