|
111 | 111 | <property name="version.properties.dir" |
112 | 112 | value="${build.src.resources}/org/apache/cassandra/config/" /> |
113 | 113 | <property name="final.name" value="${ant.project.name}-${version}"/> |
| 114 | + |
114 | 115 | <property name="accord.dir" value="modules/accord" /> |
115 | | - <!-- The reason not to use ant.project.name is we publish as "cassandra-accord" so the file names won't be named apache-cassandra-accord --> |
116 | | - <property name="accord.final.name" value="cassandra-accord-${version}"/> |
| 116 | + <property name="accord-core.build.libs" value="${accord.dir}/accord-core/build" /> |
| 117 | + <property name="accord-core.build.name" value="accord-core-${version}" /> |
| 118 | + <property name="accord-core.build.pom" value="${accord-core.build.libs}/publications/mavenJava/pom-default.xml" /> |
117 | 119 |
|
118 | 120 | <property name="local.repository" value="${user.home}/.m2/repository" /> |
119 | 121 | <property name="accord.local.repository" value="${local.repository}/org/apache/cassandra/cassandra-accord/${version}" /> |
|
2312 | 2314 | <target name="publish" |
2313 | 2315 | depends="mvn-install,sstableloader-mvn-install,artifacts" |
2314 | 2316 | description="Publishes the artifacts to the Maven repository"> |
2315 | | - <!-- Accord --> |
2316 | | - <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom" |
2317 | | - file="${accord.local.repository}/${accord.final.name}.pom" |
| 2317 | + |
| 2318 | + <!-- Accord (from the submodule's gradle build) --> |
| 2319 | + <deploy pomFile="${accord-core.build.pom}" |
| 2320 | + file="${accord-core.build.pom}" |
2318 | 2321 | packaging="pom"/> |
2319 | | - <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom" |
2320 | | - file="${accord.local.repository}/${accord.final.name}.jar" /> |
2321 | | - <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom" |
2322 | | - file="${accord.local.repository}/${accord.final.name}-sources.jar" |
| 2322 | + <deploy pomFile="${accord-core.build.pom}" |
| 2323 | + file="${accord-core.build.libs}/libs/${accord-core.build.name}.jar" /> |
| 2324 | + <deploy pomFile="${accord-core.build.pom}" |
| 2325 | + file="${accord-core.build.libs}/libs/${accord-core.build.name}-sources.jar" |
2323 | 2326 | classifier="sources"/> |
2324 | | - <deploy pomFile="${accord.local.repository}/${accord.final.name}.pom" |
2325 | | - file="${accord.local.repository}/${accord.final.name}-javadoc.jar" |
| 2327 | + <deploy pomFile="${accord-core.build.pom}" |
| 2328 | + file="${accord-core.build.libs}/libs/${accord-core.build.name}-javadoc.jar" |
2326 | 2329 | classifier="javadoc"/> |
2327 | 2330 |
|
2328 | 2331 | <!-- the parent --> |
|
0 commit comments