Skip to content

Commit ce2485a

Browse files
authored
Merge pull request #1700 from NASA-AMMOS/fix/publish-procedural-utils
Publish procedural-utils
2 parents 59b0865 + dc932fc commit ce2485a

2 files changed

Lines changed: 52 additions & 21 deletions

File tree

merlin-server/build.gradle

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
id 'java'
33
id 'application'
44
id 'com.github.node-gradle.node' version '5.0.0'
5+
id 'maven-publish'
56
id 'jacoco'
67
}
78

@@ -101,3 +102,33 @@ dependencies {
101102

102103
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
103104
}
105+
106+
// NOTE: This module is published ONLY to satisfy a transitive dependency in orchestration-utils.
107+
// It is NOT a stable public API and will be deprecated in a future version.
108+
// TODO: remove this block and the `maven-publish` plugin above once dependencies have been refactored
109+
publishing {
110+
publications {
111+
library(MavenPublication) {
112+
version = findProperty('publishing.version')
113+
from components.java
114+
115+
pom {
116+
name.set("merlin-server (INTERNAL)")
117+
description.set("This module is not supported. It was published only to satisfy a transitive dependency and will be removed in a future version.")
118+
}
119+
}
120+
}
121+
122+
publishing {
123+
repositories {
124+
maven {
125+
name = findProperty("publishing.name")
126+
url = findProperty("publishing.url")
127+
credentials {
128+
username = System.getenv(findProperty("publishing.usernameEnvironmentVariable"))
129+
password = System.getenv(findProperty("publishing.passwordEnvironmentVariable"))
130+
}
131+
}
132+
}
133+
}
134+
}

procedural/utils/build.gradle

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,24 @@ dokkaHtmlPartial.configure {
6565
}
6666
}
6767

68-
//publishing {
69-
// publications {
70-
// library(MavenPublication) {
71-
// version = findProperty("publishing.version")
72-
// from components.java
73-
// }
74-
// }
75-
//
76-
// publishing {
77-
// repositories {
78-
// maven {
79-
// name = findProperty("publishing.name")
80-
// url = findProperty("publishing.url")
81-
// credentials {
82-
// username = System.getenv(findProperty("publishing.usernameEnvironmentVariable"))
83-
// password = System.getenv(findProperty("publishing.passwordEnvironmentVariable"))
84-
// }
85-
// }
86-
// }
87-
// }
88-
//}
68+
publishing {
69+
publications {
70+
library(MavenPublication) {
71+
version = findProperty("publishing.version")
72+
from components.java
73+
}
74+
}
75+
76+
publishing {
77+
repositories {
78+
maven {
79+
name = findProperty("publishing.name")
80+
url = findProperty("publishing.url")
81+
credentials {
82+
username = System.getenv(findProperty("publishing.usernameEnvironmentVariable"))
83+
password = System.getenv(findProperty("publishing.passwordEnvironmentVariable"))
84+
}
85+
}
86+
}
87+
}
88+
}

0 commit comments

Comments
 (0)