From 9a0b1d5cee6292a01b7fddf35c9bb6e592a31d44 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:19:22 +0100 Subject: [PATCH 01/12] New gradle syntax? --- build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 26ecb3a0..68e1b906 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,8 @@ -apply plugin: 'java' -apply plugin: 'maven-publish' -apply plugin: 'com.bmuschko.nexus' +plugins { + id 'java' + id 'maven-publish' + id 'com.bmuschko.nexus' +} group = 'de.openea' version = '2.2.0' -- 2.47.2 From a3654076d18883f2523b5a4bd5b6da28c341db69 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:21:05 +0100 Subject: [PATCH 02/12] New gradle syntax? --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 68e1b906..6173d73e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,3 @@ -plugins { - id 'java' - id 'maven-publish' - id 'com.bmuschko.nexus' -} - group = 'de.openea' version = '2.2.0' @@ -46,6 +40,12 @@ buildscript { } } +plugins { + id 'java' + id 'maven-publish' + id 'com.bmuschko.nexus' +} + modifyPom { project { name 'EvA2' -- 2.47.2 From 57658b2cf89e5a75060ab549942b64bb4e069090 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:22:05 +0100 Subject: [PATCH 03/12] New gradle syntax? --- build.gradle | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 6173d73e..17f47388 100644 --- a/build.gradle +++ b/build.gradle @@ -7,6 +7,21 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' + } +} + +plugins { + id 'java' + id 'maven-publish' + id 'com.bmuschko.nexus' +} + //create a single Jar with all dependencies task fatJar(type: Jar) { manifest { @@ -31,21 +46,6 @@ dependencies { testCompile group: 'org.mockito', name: 'mockito-core', version: '1.+' } -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' - } -} - -plugins { - id 'java' - id 'maven-publish' - id 'com.bmuschko.nexus' -} - modifyPom { project { name 'EvA2' -- 2.47.2 From 88be5ee431eb97bbd8b434df384e83ad124a6ff3 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:23:21 +0100 Subject: [PATCH 04/12] New gradle syntax? --- build.gradle | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 17f47388..b869d00a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,3 @@ -group = 'de.openea' -version = '2.2.0' - -description = "EvA2" - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - - buildscript { repositories { jcenter() @@ -23,6 +14,14 @@ plugins { } //create a single Jar with all dependencies +group = 'de.openea' +version = '2.2.0' + +description = "EvA2" + +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + task fatJar(type: Jar) { manifest { attributes 'Implementation-Title': 'Gradle Jar File Example', -- 2.47.2 From 7c86c2908a87ab1ff35351e4bca3ba8a3a86198b Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:26:19 +0100 Subject: [PATCH 05/12] New gradle syntax? --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b869d00a..e0a649b8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { plugins { id 'java' id 'maven-publish' - id 'com.bmuschko.nexus' + id 'com.bmuschko.nexus' version "2.3.1" } //create a single Jar with all dependencies -- 2.47.2 From c63c3751b6b08190b682f86c420bc5f2d5e2d1de Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:28:10 +0100 Subject: [PATCH 06/12] New gradle syntax? --- build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index e0a649b8..d7a72c17 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,11 @@ buildscript { repositories { jcenter() } - dependencies { - classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' - } } plugins { id 'java' id 'maven-publish' - id 'com.bmuschko.nexus' version "2.3.1" } //create a single Jar with all dependencies @@ -82,7 +78,3 @@ extraArchive { javadoc = true } -nexus { - repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2' - snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots' -} -- 2.47.2 From 72205cc5ab66d0e7b44d218d33132b6f97bbb8bc Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:31:20 +0100 Subject: [PATCH 07/12] New gradle syntax? --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d7a72c17..8e5d9971 100644 --- a/build.gradle +++ b/build.gradle @@ -34,8 +34,8 @@ repositories { } dependencies { - compile group: 'javax.help', name: 'javahelp', version: '2.0.05' - compile group: 'org.yaml', name: 'snakeyaml', version: '1.16' + implementation group: 'javax.help', name: 'javahelp', version: '2.0.05' + implementation group: 'org.yaml', name: 'snakeyaml', version: '1.16' compile group: 'gov.nist.math', name: 'jama', version: '1.0.3' testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.+' -- 2.47.2 From 1f9850323f9ab5424b1426949ce5e2b064bf46e1 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:32:04 +0100 Subject: [PATCH 08/12] New gradle syntax? --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8e5d9971..0157658e 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ repositories { dependencies { implementation group: 'javax.help', name: 'javahelp', version: '2.0.05' implementation group: 'org.yaml', name: 'snakeyaml', version: '1.16' - compile group: 'gov.nist.math', name: 'jama', version: '1.0.3' + implementation group: 'gov.nist.math', name: 'jama', version: '1.0.3' testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.+' } -- 2.47.2 From 70ee07d97566a332141b6734d864f81c4ed50ca7 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:33:19 +0100 Subject: [PATCH 09/12] New gradle syntax? --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0157658e..839fe545 100644 --- a/build.gradle +++ b/build.gradle @@ -37,8 +37,8 @@ dependencies { implementation group: 'javax.help', name: 'javahelp', version: '2.0.05' implementation group: 'org.yaml', name: 'snakeyaml', version: '1.16' implementation group: 'gov.nist.math', name: 'jama', version: '1.0.3' - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.mockito', name: 'mockito-core', version: '1.+' + testImplementation group: 'junit', name: 'junit', version: '4.12' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '1.+' } modifyPom { -- 2.47.2 From 9ab205db5c8c132d5357d1b15da11d8026b71d87 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:36:39 +0100 Subject: [PATCH 10/12] New gradle syntax? --- build.gradle | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 839fe545..58e453a4 100644 --- a/build.gradle +++ b/build.gradle @@ -41,32 +41,36 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '1.+' } -modifyPom { - project { - name 'EvA2' - description 'Gradle plugin that provides tasks for configuring and uploading artifacts to Sonatype Nexus.' - url 'http://www.ra.cs.uni-tuebingen.de/software/eva2/' - inceptionYear '2008' +publishing { + publications { + mavenJava(MavenPublication) { + pom { + name 'EvA2' + description 'Gradle plugin that provides tasks for configuring and uploading artifacts to Sonatype Nexus.' + url 'http://www.ra.cs.uni-tuebingen.de/software/eva2/' + inceptionYear '2008' - scm { - url 'https://gitlab.cs.uni-tuebingen.de/eva2/eva2/' - connection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' - developerConnection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' - } + scm { + url 'https://gitlab.cs.uni-tuebingen.de/eva2/eva2/' + connection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' + developerConnection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' + } - licenses { - license { - name 'GNU Lesser General Public License, Version 3.0' - url 'http://www.gnu.org/licenses/lgpl-3.0.html' - distribution 'repo' - } - } + licenses { + license { + name 'GNU Lesser General Public License, Version 3.0' + url 'http://www.gnu.org/licenses/lgpl-3.0.html' + distribution 'repo' + } + } - developers { - developer { - id 'halfdan' - name 'Fabian Becker' - email 'halfdan@xnorfz.de' + developers { + developer { + id 'halfdan' + name 'Fabian Becker' + email 'halfdan@xnorfz.de' + } + } } } } -- 2.47.2 From 51428641ef953dd620f31c0b368b07278365b0da Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:38:17 +0100 Subject: [PATCH 11/12] New gradle syntax? --- build.gradle | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 58e453a4..1a10ab89 100644 --- a/build.gradle +++ b/build.gradle @@ -41,40 +41,40 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '1.+' } -publishing { - publications { - mavenJava(MavenPublication) { - pom { - name 'EvA2' - description 'Gradle plugin that provides tasks for configuring and uploading artifacts to Sonatype Nexus.' - url 'http://www.ra.cs.uni-tuebingen.de/software/eva2/' - inceptionYear '2008' +//publishing { + //publications { + //mavenJava(MavenPublication) { + //pom { + //name 'EvA2' + //description 'Gradle plugin that provides tasks for configuring and uploading artifacts to Sonatype Nexus.' + //url 'http://www.ra.cs.uni-tuebingen.de/software/eva2/' + //inceptionYear '2008' - scm { - url 'https://gitlab.cs.uni-tuebingen.de/eva2/eva2/' - connection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' - developerConnection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' - } + //scm { + //url 'https://gitlab.cs.uni-tuebingen.de/eva2/eva2/' + //connection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' + //developerConnection 'scm:https://gitlab.cs.uni-tuebingen.de/eva2/eva2/.git' + //} - licenses { - license { - name 'GNU Lesser General Public License, Version 3.0' - url 'http://www.gnu.org/licenses/lgpl-3.0.html' - distribution 'repo' - } - } + //licenses { + //license { + //name 'GNU Lesser General Public License, Version 3.0' + //url 'http://www.gnu.org/licenses/lgpl-3.0.html' + //distribution 'repo' + //} + //} - developers { - developer { - id 'halfdan' - name 'Fabian Becker' - email 'halfdan@xnorfz.de' - } - } - } - } - } -} + //developers { + //developer { + //id 'halfdan' + //name 'Fabian Becker' + //email 'halfdan@xnorfz.de' + //} + //} + //} + //} + //} +//} extraArchive { sources = true -- 2.47.2 From a08017f8fbd91556a3a8c7cba93df296c4af6c13 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 30 Dec 2021 10:39:06 +0100 Subject: [PATCH 12/12] New gradle syntax? --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 1a10ab89..c365957a 100644 --- a/build.gradle +++ b/build.gradle @@ -76,9 +76,9 @@ dependencies { //} //} -extraArchive { - sources = true - tests = true - javadoc = true -} +//extraArchive { + //sources = true + //tests = true + //javadoc = true +//} -- 2.47.2