Skip to content

Commit 2079eba

Browse files
committed
[build] Fixing ant edge.release.
1 parent afceb13 commit 2079eba

File tree

3 files changed

+21
-50
lines changed

3 files changed

+21
-50
lines changed

buildScripts/maven.ant.xml

-14
Original file line numberDiff line numberDiff line change
@@ -146,19 +146,5 @@ This buildfile is part of projectlombok.org. It makes maven-compatible repositor
146146
<not><isset property="mvn.result" /></not>
147147
</condition>
148148
</fail>
149-
<copy file="dist/lombok-${lombok.version}.jar" tofile="build/edge-releases/lombok-edge.jar" />
150-
</target>
151-
152-
<target name="maven.edge-publish" depends="maven.edge, compile.support" description="Creates the maven repo for the snapshot build and publishes it to projectlombok.org">
153-
<java classname="lombok.publish.PublishToBucket" failonerror="true">
154-
<classpath>
155-
<path refid="cp.buildtools" />
156-
<pathelement location="build/support" />
157-
</classpath>
158-
<arg value="${gpg.keyrings}/s3_creds.txt" />
159-
<arg value="build/edge-releases" />
160-
<arg value="edge" />
161-
<arg value="true" />
162-
</java>
163149
</target>
164150
</project>

buildScripts/website.ant.xml

+20-36
Original file line numberDiff line numberDiff line change
@@ -260,25 +260,13 @@ such as applying the templates to produce the website, converting the changelog
260260
</target>
261261

262262
<target name="-release.publish.site" depends="release.pack">
263-
<ivy:scpUpload
264-
from="dist/website-release.tar.bz2"
265-
to="/data/lombok/staging"
266-
server="projectlombok.org"
267-
username="${ssh.username}"
268-
keyfile="${ssh.keyfile}"
269-
knownHosts="ssh.knownHosts" />
270-
<ivy:sshExec
271-
cmd="/data/lombok/stagingCmd/deployRelease"
272-
server="projectlombok.org"
273-
username="${ssh.username}"
274-
keyfile="${ssh.keyfile}"
275-
knownHosts="ssh.knownHosts" />
263+
<fail />
276264
</target>
277265

278266
<target name="release.publish" depends="maven, -release.publish.site, website.publish, eclipsep2.publish, maven.publish" description="Deploys a new official lombok release everywhere: maven, website, p2 site" />
279267

280-
<target name="edge.pack" depends="compile.support, version, dist, maven.edge">
281-
<delete file="build/website/download-edge.html" />
268+
<target name="edge.website" depends="compile.support, version, dist">
269+
<delete quiet="true" file="build/website/download-edge.html" />
282270
<mkdir dir="build/website-edge" />
283271
<java classname="lombok.website.WebsiteMaker" failonerror="true">
284272
<classpath>
@@ -292,30 +280,26 @@ such as applying the templates to produce the website, converting the changelog
292280
<arg value="website" />
293281
<arg value="build/website-edge/download-edge.html" />
294282
</java>
295-
<copy file="dist/lombok.jar" tofile="build/website-edge/lombok-edge.jar" />
296-
<tar destfile="dist/website-edge.tar.bz2" compression="bzip2">
297-
<tarfileset dir="build/website-edge" />
298-
<tarfileset dir="build">
299-
<include name="edge-releases/**" />
300-
</tarfileset>
301-
</tar>
302283
</target>
303284

304-
<target name="edge.publish" depends="edge.pack" description="Builds an edge release, sends it to the projectlombok.org server and deploys it by updating the download-edge link">
305-
<ivy:scpUpload
306-
from="dist/website-edge.tar.bz2"
307-
to="/data/lombok/staging"
308-
server="projectlombok.org"
309-
username="${ssh.username}"
310-
keyfile="${ssh.keyfile}"
311-
knownHosts="ssh.knownHosts" />
312-
<ivy:sshExec
313-
cmd="/data/lombok/stagingCmd/deployEdge"
314-
server="projectlombok.org"
315-
username="${ssh.username}"
316-
keyfile="${ssh.keyfile}"
317-
knownHosts="ssh.knownHosts" />
285+
<target name="-edge.website.tohost" depends="edge.website, -website.init-hostgit, -website.pull-hostgit">
286+
<copy file="build/website-edge/download-edge.html" todir="${loc.hostingsite}/website" />
287+
</target>
318288

289+
<target name="-edge.website.publish" depends="-edge.website.tohost, -website.commit-and-push-hostgit" />
290+
291+
<target name="edge.publish" depends="dist, -edge.website.publish, maven.edge" description="Builds an edge release, sends it to the projectlombok.org server and deploys it by updating the download-edge link">
292+
<copy file="dist/lombok-${lombok.version}.jar" tofile="build/edge-releases/lombok-edge.jar" />
293+
<java classname="lombok.publish.PublishToBucket" failonerror="true">
294+
<classpath>
295+
<path refid="cp.buildtools" />
296+
<pathelement location="build/support" />
297+
</classpath>
298+
<arg value="${gpg.keyrings}/s3_creds.txt" />
299+
<arg value="build/edge-releases" />
300+
<arg value="edge" />
301+
<arg value="true" />
302+
</java>
319303
<exec executable="/usr/bin/git" failonerror="true">
320304
<arg value="merge-base" />
321305
<arg value="--is-ancestor" />

doc/changelog.markdown

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Lombok Changelog
66
* BUGFIX: Eclipse 4.27 and VSCode 1.14.0 would ignore `lombok.config`. [Issue #3332](https://github.com/projectlombok/lombok/issues/3332).
77
* BUGFIX: `@NonNull` on a primitive array field on a record wouldn't work. [Issue #3366](https://github.com/projectlombok/lombok/issues/3366).
88
* FEATURE: Jakarta has some non-null annotations (such as `jakarta.annotation.Nonnull`) which we now support. [Issue #3346](https://github.com/projectlombok/lombok/issues/3346).
9+
* BUGFIX: Eclipse didn't find usages of extension methods (`@ExtensionMethod`) in "find references" nor rename-refactoring. [Issue #3373](https://github.com/projectlombok/lombok/issues/3373)
910

1011
### v1.18.26 (Feb 3rd, 2023)
1112

0 commit comments

Comments
 (0)