From 56c394aab8ee5b9322db828872af032f1478b6b0 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <ranger@opennms.org>
Date: Thu, 22 Jun 2023 12:21:06 -0400
Subject: [PATCH] deploy to a local tempdir instead of upstream archives

---
 buildSrc/src/main/groovy/MavenBomPlugin.groovy |  4 ++--
 buildSrc/src/main/groovy/MavenBomTask.groovy   | 10 +++++-----
 gradle/deploy-artifacts.gradle                 | 16 +++++++++++-----
 gradle/javaprojects.gradle                     |  4 ++--
 gradle/maven-deployment.gradle                 | 10 +++++-----
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/buildSrc/src/main/groovy/MavenBomPlugin.groovy b/buildSrc/src/main/groovy/MavenBomPlugin.groovy
index bc0ba7b7ee3..98dba392d27 100644
--- a/buildSrc/src/main/groovy/MavenBomPlugin.groovy
+++ b/buildSrc/src/main/groovy/MavenBomPlugin.groovy
@@ -15,6 +15,6 @@ public class MavenBomPlugin implements Plugin<Project> {
 		project.plugins.apply(MavenPlugin)
 		project.task(MAVEN_BOM_TASK_NAME, type: MavenBomTask, group: 'Generate', description: 'Configures the pom as a Maven Build of Materials (BOM)')
 		project.install.dependsOn project.mavenBom
-		project.uploadArchives.dependsOn project.mavenBom
+		// project.uploadArchives.dependsOn project.mavenBom
 	}
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/groovy/MavenBomTask.groovy b/buildSrc/src/main/groovy/MavenBomTask.groovy
index bd05645aa58..e463daed84c 100644
--- a/buildSrc/src/main/groovy/MavenBomTask.groovy
+++ b/buildSrc/src/main/groovy/MavenBomTask.groovy
@@ -34,11 +34,11 @@ public class MavenBomTask extends DefaultTask {
 			}
 		}
 
-		project.uploadArchives {
-			repositories.mavenDeployer {
-				customizePom(pom)
-			}
-		}
+//		project.uploadArchives {
+//			repositories.mavenDeployer {
+//				customizePom(pom)
+//			}
+//		}
 	}
 
 	public void customizePom(pom) {
diff --git a/gradle/deploy-artifacts.gradle b/gradle/deploy-artifacts.gradle
index 199b48231c8..00321a7d4b8 100644
--- a/gradle/deploy-artifacts.gradle
+++ b/gradle/deploy-artifacts.gradle
@@ -1,11 +1,17 @@
 def isSnapshot = version?.matches(/^.*[.-]BUILD-SNAPSHOT$/)
 
+apply plugin: 'maven'
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: "file:///tmp/spring-security")
+        }
+    }
+}
+
 task deployArtifacts {
 	group = 'Deploy tasks'
 	description = "Deploys the artifacts to either Artifactory or Maven Central"
-	if(isSnapshot) {
-		dependsOn "artifactoryPublish"
-	} else {
-		dependsOn "uploadArchives"
-	}
+	dependsOn "uploadArchives"
 }
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 4a9c747f221..36dc7dda550 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -5,8 +5,8 @@ apply plugin: 'javadocHotfix'
 apply plugin: 'propdeps'
 apply plugin: 'propdeps-maven'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 ext.apacheDsVersion = '1.5.5'
 ext.aspectjVersion = '1.8.14'
diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle
index 1ae4db1b13d..a1e9ea83ba5 100644
--- a/gradle/maven-deployment.gradle
+++ b/gradle/maven-deployment.gradle
@@ -25,11 +25,11 @@ install {
 	}
 }
 
-uploadArchives {
-	repositories.mavenDeployer {
-		customizePom(pom, project)
-	}
-}
+//uploadArchives {
+//	repositories.mavenDeployer {
+//		customizePom(pom, project)
+//	}
+//}
 
 def customizePom(pom, gradleProject) {
 	pom.whenConfigured { p ->