[Git][java-team/lombok-patcher][master] 4 commits: Install the Maven artifacts
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed May 11 07:26:39 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lombok-patcher
Commits:
fefd1ab4 by Emmanuel Bourg at 2022-05-11T00:59:41+02:00
Install the Maven artifacts
- - - - -
71ed48a7 by Emmanuel Bourg at 2022-05-11T08:13:03+02:00
Build with ivy-debian-helper
- - - - -
c9adc6a9 by Emmanuel Bourg at 2022-05-11T08:26:10+02:00
Install the Maven artifacts for lombok.injector
- - - - -
13a6b9e5 by Emmanuel Bourg at 2022-05-11T08:26:22+02:00
Upload to unstable
- - - - -
13 changed files:
- debian/changelog
- + debian/clean
- debian/control
- − debian/liblombok-patcher-java.jlibs
- + debian/liblombok-patcher-java.poms
- − debian/linkjars
- + debian/maven.ignoreRules
- − debian/patches/build.patch
- + debian/patches/ivy-configuration.patch
- debian/patches/series
- + debian/poms/injector.pom
- + debian/poms/patcher.pom
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+lombok-patcher (0.42-3) unstable; urgency=medium
+
+ * Team upload.
+ * Build with ivy-debian-helper
+ * Install the Maven artifacts for lombok.injector
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 11 May 2022 08:26:13 +0200
+
+lombok-patcher (0.42-2) unstable; urgency=medium
+
+ * Install the Maven artifacts
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 11 May 2022 00:59:25 +0200
+
lombok-patcher (0.42-1) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
@@ -0,0 +1,2 @@
+.ivy/
+dist/
=====================================
debian/control
=====================================
@@ -9,12 +9,13 @@ Build-Depends:
ant-optional,
debhelper-compat (= 12),
default-jdk,
+ ivy-debian-helper,
ivyplusplus,
- javahelper,
libasm-java (>= 5.0),
libjna-java,
libjsch-java,
- liblombok-java
+ liblombok-java,
+ maven-repo-helper
Standards-Version: 4.6.0.1
Homepage: https://projectlombok.org
Vcs-Git: https://salsa.debian.org/java-team/lombok-patcher.git
=====================================
debian/liblombok-patcher-java.jlibs deleted
=====================================
@@ -1,2 +0,0 @@
-dist/lombok.patcher.jar
-dist/lombok.injector-0.42.jar
=====================================
debian/liblombok-patcher-java.poms
=====================================
@@ -0,0 +1,2 @@
+debian/poms/patcher.pom --java-lib --set-version=0.42 --artifact=dist/lombok.patcher.jar
+debian/poms/injector.pom --java-lib --set-version=0.42 --artifact=dist/lombok.injector-*.jar
=====================================
debian/linkjars deleted
=====================================
@@ -1,5 +0,0 @@
-lib
-lib/build
-lib/runtime
-lib/contrib
-lib/runtimeInjector
=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,3 @@
+
+junit junit
+projectlombok.org jsch-ant-fixed
=====================================
debian/patches/build.patch deleted
=====================================
@@ -1,84 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 2 Oct 2018 22:43:11 +0200
-Subject: build
-
-Forwarded: not-needed
----
- build.xml | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
---- a/build.xml
-+++ b/build.xml
-@@ -87,7 +87,7 @@
- <delete dir=".settings" quiet="true" />
- </target>
-
-- <target name="version" depends="ensure-ipp" description="Shows the version number.">
-+ <target name="version" depends="" description="Shows the version number.">
- <mkdir dir="build/pack" />
- <ivy:compile srcdir="src/patcher" destdir="build/pack" target="1.5" source="1.5" ecj="true" includes="lombok/patcher/Version.java" />
- <java
-@@ -99,7 +99,7 @@
- <echo level="info">Lombok patcher version: ${lombok.patcher.version}</echo>
- </target>
-
-- <target name="unpackLibs" depends="ensureRuntimeDeps, ensureRuntimeInjectorDeps" unless="pointless">
-+ <target name="unpackLibs" depends="" unless="pointless">
- <unjar dest="build/pack">
- <path refid="runtime.path" />
- </unjar>
-@@ -109,15 +109,17 @@
- <delete file="build/pack/module-info.class" quiet="true" />
- </target>
-
-- <target name="compile" depends="unpackLibs, ensureBuildDeps" description="Compiles lombok.patcher" unless="pointless">
-+ <target name="compile" depends="" description="Compiles lombok.patcher" unless="pointless">
- <ivy:compile destdir="build/pack" target="1.5" source="1.5" ecj="true">
- <src path="src/patcher" />
- <classpath refid="build.path" />
-+ <compilerarg line="-processorpath /usr/share/java/lombok.jar" />
- </ivy:compile>
- <ivy:compile destdir="build/pack" target="1.5" source="1.5" ecj="true">
- <src path="src/injector" />
- <classpath path="build/pack" />
- <classpath refid="build.path" />
-+ <compilerarg line="-processorpath /usr/share/java/lombok.jar" />
- </ivy:compile>
- </target>
-
-@@ -139,7 +141,7 @@
- </condition>
- </target>
-
-- <target name="-test" depends="-test-setup, compileTests" unless="skipTests">
-+ <target name="-test" depends="" unless="skipTests">
- <junit haltonfailure="yes" fork="on">
- <formatter type="plain" usefile="false" unless="tests.quiet" />
- <classpath path="build/pack" />
-@@ -155,7 +157,7 @@
-
- <target name="test" depends="-test" description="Runs the unit tests" />
-
-- <target name="dist" depends="-pointlessCheck, -test.quiet, -test, version, compile" unless="pointless" description="Creates the distributable">
-+ <target name="dist" depends="-pointlessCheck, version, compile" unless="pointless" description="Creates the distributable">
- <mkdir dir="dist" />
- <jar basedir="build/pack" destfile="dist/lombok.patcher-${lombok.patcher.version}.jar" />
- <jar destfile="dist/lombok.injector-${lombok.patcher.version}.jar">
-@@ -165,7 +167,7 @@
- <copy file="dist/lombok.patcher-${lombok.patcher.version}.jar" tofile="dist/lombok.patcher.jar" />
- </target>
-
-- <target name="config-ivy" depends="ensure-ipp">
-+ <target name="config-ivy" depends="">
- <ivy:configure file="buildScripts/ivysettings.xml" />
- </target>
-
-@@ -204,7 +206,7 @@
- <echo>automated uploading and deployment temporarily disabled. Upload dist/lombok.patcher-${lombok.patcher.version}.jar to the server and deploy manually.</echo>
- </target>
-
-- <target name="eclipse" depends="deps, contrib" description="Creates eclipse project files and downloads all dependencies. Open this directory as project in eclipse after running this target.">
-+ <target name="eclipse" depends="contrib" description="Creates eclipse project files and downloads all dependencies. Open this directory as project in eclipse after running this target.">
- <ivy:eclipsegen source="1.5">
- <srcdir dir="src/patcher" />
- <srcdir dir="src/injector" />
=====================================
debian/patches/ivy-configuration.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Adjusts the ivy configuration to work with ivy-debian-helper
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -166,7 +166,7 @@
+ </target>
+
+ <target name="config-ivy" depends="ensure-ipp">
+- <ivy:configure file="buildScripts/ivysettings.xml" />
++ <ivy:configure file="/usr/share/ivy-debian-helper/ivysettings.xml" />
+ </target>
+
+ <target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps" />
+--- a/buildScripts/ivy.xml
++++ b/buildScripts/ivy.xml
+@@ -10,7 +10,6 @@
+ <dependencies>
+ <dependency org="junit" name="junit" rev="4.13" conf="test -> default"/>
+ <dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="build->default" />
+- <dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.45" conf="build" />
+ <dependency org="org.ow2.asm" name="asm" rev="9.1" conf="runtime, build -> default; contrib->sources" />
+ <dependency org="org.ow2.asm" name="asm-tree" rev="9.1" conf="runtime, build->default; contrib->sources" />
+ <dependency org="org.ow2.asm" name="asm-commons" rev="9.1" conf="runtime, build->default; contrib->sources" />
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-build.patch
+ivy-configuration.patch
=====================================
debian/poms/injector.pom
=====================================
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok.injector</artifactId>
+ <packaging>jar</packaging>
+ <version>@VERSION@</version>
+ <name>Project Lombok</name>
+ <url>https://projectlombok.org</url>
+ <description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description>
+ <dependencies></dependencies>
+ <developers>
+ <developer>
+ <id>rzwitserloot</id>
+ <name>Reinier Zwitserloot</name>
+ <email>reinier at projectlombok.org</email>
+ <url>http://zwitserloot.com</url>
+ <timezone>Europe/Amsterdam</timezone>
+ </developer>
+ <developer>
+ <id>rspilker</id>
+ <name>Roel Spilker</name>
+ <email>roel at projectlombok.org</email>
+ <timezone>Europe/Amsterdam</timezone>
+ </developer>
+ </developers>
+</project>
+
=====================================
debian/poms/patcher.pom
=====================================
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok.patcher</artifactId>
+ <packaging>jar</packaging>
+ <version>@VERSION@</version>
+ <name>Project Lombok</name>
+ <url>https://projectlombok.org</url>
+ <description>Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more!</description>
+ <dependencies></dependencies>
+ <developers>
+ <developer>
+ <id>rzwitserloot</id>
+ <name>Reinier Zwitserloot</name>
+ <email>reinier at projectlombok.org</email>
+ <url>http://zwitserloot.com</url>
+ <timezone>Europe/Amsterdam</timezone>
+ </developer>
+ <developer>
+ <id>rspilker</id>
+ <name>Roel Spilker</name>
+ <email>roel at projectlombok.org</email>
+ <timezone>Europe/Amsterdam</timezone>
+ </developer>
+ </developers>
+</project>
+
=====================================
debian/rules
=====================================
@@ -1,14 +1,10 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-
%:
- dh $@ --with javahelper
-
-override_dh_auto_clean:
- dh_auto_clean
- ant distclean
+ dh $@ --buildsystem=ivy --with maven-repo-helper
override_dh_auto_build:
- mkdir -p build/packInjector
- ant dist
+ dh_auto_build -- dist \
+ -Divy.default.ivy.user.dir=$(shell pwd)/.ivy \
+ -DskipTests=true \
+ -Divyplusplus.minimumAvailable=true
View it on GitLab: https://salsa.debian.org/java-team/lombok-patcher/-/compare/0dce5113ccd5ce741d637f6deac29bbadc16c7b8...13a6b9e5315aae82939669f7cece9ccd89dd9336
--
View it on GitLab: https://salsa.debian.org/java-team/lombok-patcher/-/compare/0dce5113ccd5ce741d637f6deac29bbadc16c7b8...13a6b9e5315aae82939669f7cece9ccd89dd9336
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220511/692c703b/attachment.htm>
More information about the pkg-java-commits
mailing list