[ivyplusplus] 01/02: build core without lombok or cmdreader
Hans-Christoph Steiner
eighthave at moszumanska.debian.org
Mon Dec 28 21:54:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
eighthave pushed a commit to branch master
in repository ivyplusplus.
commit 24d3b5667234fd35e385e6447d01b52856d56c2c
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Mon Dec 28 20:38:06 2015 +0100
build core without lombok or cmdreader
This removes all circular dependencies, so lombok and cmdreader can easily
be built using ivyplusplus.
---
debian/build.xml | 6 +-
debian/control | 4 +-
.../expand_getter_setter_into_plain_java.patch | 68 ++++++++++++++++++++++
.../expand_sneakythrows_into_plain_java.patch | 36 ------------
debian/patches/series | 2 +-
5 files changed, 73 insertions(+), 43 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index 9e5ece5..370cbec 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -23,11 +23,11 @@
<mkdir dir="build/pack" />
<javac destdir="build/pack" encoding="UTF-8">
<src path="src" />
+ <exclude name="com/zwitserloot/ivyplusplus/CachedUnjar.java" />
+ <exclude name="com/zwitserloot/ivyplusplus/createProject/**" />
<exclude name="com/zwitserloot/ivyplusplus/eclipse/**" />
<exclude name="com/zwitserloot/ivyplusplus/intellij/**" />
- <exclude name="com/zwitserloot/ivyplusplus/mavencentral/CreateSigningKey_.java" />
- <exclude name="com/zwitserloot/ivyplusplus/mavencentral/CreateDetachedSignatures_.java" />
- <exclude name="com/zwitserloot/ivyplusplus/mavencentral/InitializeBouncyCastle.java" />
+ <exclude name="com/zwitserloot/ivyplusplus/mavencentral/**" />
<classpath refid="build.path" />
</javac>
</target>
diff --git a/debian/control b/debian/control
index 3a872e3..c5c41a4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,8 @@ Uploaders: Hans-Christoph Steiner <hans at eds.org>
Build-Depends: debhelper (>= 9),
ant,
ant-optional,
- cmdreader,
default-jdk,
- ivy,
- liblombok-java
+ ivy
Standards-Version: 3.9.6
Homepage: https://github.com/rzwitserloot/ivyplusplus
Vcs-Git: https://anonscm.debian.org/git/pkg-java/ivyplusplus.git
diff --git a/debian/patches/expand_getter_setter_into_plain_java.patch b/debian/patches/expand_getter_setter_into_plain_java.patch
new file mode 100644
index 0000000..b5fdeda
--- /dev/null
+++ b/debian/patches/expand_getter_setter_into_plain_java.patch
@@ -0,0 +1,68 @@
+--- a/src/com/zwitserloot/ivyplusplus/Compile.java
++++ b/src/com/zwitserloot/ivyplusplus/Compile.java
+@@ -30,8 +30,6 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import lombok.Setter;
+-
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.DynamicAttribute;
+ import org.apache.tools.ant.RuntimeConfigurable;
+@@ -49,13 +47,17 @@
+ private UnknownElement javac, copy, mkdir;
+ private Path src;
+ private boolean doCopy = true;
+- @Setter private String copyExcludes;
++ private String copyExcludes;
+ private boolean destdirSet;
+
+ public void setCopy(boolean copy) {
+ this.doCopy = copy;
+ }
+
++ public void setCopyExcludes(String copyExcludes) {
++ this.copyExcludes = copyExcludes;
++ }
++
+ public void init() {
+ javac = new UnknownElement("javac");
+ copy = new UnknownElement("copy");
+--- a/src/com/zwitserloot/ivyplusplus/EnsureVersion.java
++++ b/src/com/zwitserloot/ivyplusplus/EnsureVersion.java
+@@ -25,16 +25,29 @@
+ import java.util.Collections;
+ import java.util.List;
+
+-import lombok.Getter;
+-import lombok.Setter;
+-
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+
+ public class EnsureVersion extends Task {
+- @Getter @Setter private String version;
+- @Getter @Setter private String property;
+-
++ private String version;
++ private String property;
++
++ public String getVersion() {
++ return version;
++ }
++
++ public void setVersion(String version) {
++ this.version = version;
++ }
++
++ public String getProperty() {
++ return property;
++ }
++
++ public void setProperty(String property) {
++ this.property = property;
++ }
++
+ @Override public void execute() throws BuildException {
+ if (version == null || version.isEmpty()) throw new BuildException("Must specify mandatory attribute 'version'", getLocation());
+
diff --git a/debian/patches/expand_sneakythrows_into_plain_java.patch b/debian/patches/expand_sneakythrows_into_plain_java.patch
deleted file mode 100644
index c5c6fdd..0000000
--- a/debian/patches/expand_sneakythrows_into_plain_java.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: lombok's @SneakyThrow decorator is not yet working
- This is a temporary hack until someone gets lombok's @SneakyThrow
- decorator working in this context.
-
---- a/src/com/zwitserloot/ivyplusplus/mavencentral/CreateArtifactBundle.java
-+++ b/src/com/zwitserloot/ivyplusplus/mavencentral/CreateArtifactBundle.java
-@@ -34,8 +34,8 @@
- import java.util.jar.JarOutputStream;
-
- import lombok.Cleanup;
-+import lombok.Lombok;
- import lombok.Setter;
--import lombok.SneakyThrows;
-
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Task;
-@@ -156,8 +156,8 @@
- }
- }
-
-- @SneakyThrows(IOException.class)
- private static byte[] replaceVersion(byte[] in, String token_, String replacement_) {
-+ try {
- int start = 0;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- byte[] token = token_.getBytes("US-ASCII");
-@@ -176,6 +176,9 @@
- }
-
- return out.toByteArray();
-+ } catch (IOException e) {
-+ throw Lombok.sneakyThrow(e);
-+ }
- }
-
- private static int find(byte[] haystack, byte[] needle, int start) {
diff --git a/debian/patches/series b/debian/patches/series
index 0c5e3c6..0aec1c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
expand_data_decorator_into_java_constructor.patch
-expand_sneakythrows_into_plain_java.patch
+expand_getter_setter_into_plain_java.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ivyplusplus.git
More information about the pkg-java-commits
mailing list