[ivyplusplus] 01/05: Drop all patches.
Markus Koschany
apo-guest at moszumanska.debian.org
Mon Feb 15 18:42:47 GMT 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository ivyplusplus.
commit df86b484fe89770ccb2beb470a5d717a04f8c9b5
Author: Markus Koschany <apo at debian.org>
Date: Mon Feb 15 00:30:51 2016 +0100
Drop all patches.
---
...pand_data_decorator_into_java_constructor.patch | 59 -------------------
.../expand_getter_setter_into_plain_java.patch | 68 ----------------------
...e_excluded_classes_from_ant_plugin_config.patch | 18 ------
debian/patches/series | 3 -
4 files changed, 148 deletions(-)
diff --git a/debian/patches/expand_data_decorator_into_java_constructor.patch b/debian/patches/expand_data_decorator_into_java_constructor.patch
deleted file mode 100644
index a22cfc4..0000000
--- a/debian/patches/expand_data_decorator_into_java_constructor.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: lombok's @Data decorator is not yet working
- This is a temporary hack until someone gets lombok's @Data
- decorator working in this context.
-
---- a/src/com/zwitserloot/ivyplusplus/EnsureVersion.java
-+++ b/src/com/zwitserloot/ivyplusplus/EnsureVersion.java
-@@ -25,7 +25,6 @@
- import java.util.Collections;
- import java.util.List;
-
--import lombok.Data;
- import lombok.Getter;
- import lombok.Setter;
-
-@@ -74,10 +73,14 @@
- return true;
- }
-
-- @Data
- private static class VersionPart implements Comparable<VersionPart> {
- private final int number;
- private final String name;
-+
-+ public VersionPart(int number, String name) {
-+ this.number = number;
-+ this.name = name;
-+ }
-
- public int compareTo(VersionPart o) {
- if (o.name == null) {
---- a/src/com/zwitserloot/ivyplusplus/CachedUnjar.java
-+++ b/src/com/zwitserloot/ivyplusplus/CachedUnjar.java
-@@ -36,7 +36,6 @@
- import java.util.Set;
-
- import lombok.Cleanup;
--import lombok.Data;
-
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Project;
-@@ -193,11 +192,16 @@
- return out;
- }
-
-- @Data
- private static class CacheRecord {
- private final String name;
- private final long lastMod, len;
--
-+
-+ public CacheRecord(String name, long lastMod, long len) {
-+ this.name = name;
-+ this.lastMod = lastMod;
-+ this.len = len;
-+ }
-+
- static CacheRecord read(String line) {
- String[] elems = line.split(" ::: ", 3);
- return new CacheRecord(elems[0], Long.parseLong(elems[1]), Long.parseLong(elems[2]));
diff --git a/debian/patches/expand_getter_setter_into_plain_java.patch b/debian/patches/expand_getter_setter_into_plain_java.patch
deleted file mode 100644
index b5fdeda..0000000
--- a/debian/patches/expand_getter_setter_into_plain_java.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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/remove_excluded_classes_from_ant_plugin_config.patch b/debian/patches/remove_excluded_classes_from_ant_plugin_config.patch
deleted file mode 100644
index 99625b1..0000000
--- a/debian/patches/remove_excluded_classes_from_ant_plugin_config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/com/zwitserloot/ivyplusplus/antlib.xml
-+++ b/src/com/zwitserloot/ivyplusplus/antlib.xml
-@@ -22,15 +22,9 @@
- -->
- <antlib xmlns:current="ant:current">
- <!-- insert here -->
-- <typedef name="eclipsegen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
-- <typedef name="intellijgen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
-- <typedef name="eclipse-gen" classname="com.zwitserloot.ivyplusplus.eclipse.BuildEclipseProject" />
-- <typedef name="intellij-gen" classname="com.zwitserloot.ivyplusplus.intellij.BuildIntellijProject" />
- <typedef name="compile" classname="com.zwitserloot.ivyplusplus.Compile" />
- <typedef name="ensureippversion" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
- <typedef name="ensure-ipp-version" classname="com.zwitserloot.ivyplusplus.EnsureVersion" />
-- <typedef name="create-artifact-bundle" classname="com.zwitserloot.ivyplusplus.mavencentral.CreateArtifactBundle" />
-- <typedef name="cachedunjar" classname="com.zwitserloot.ivyplusplus.CachedUnjar" />
-
- <macrodef name="show-html" description="Shows an HTML page.">
- <attribute name="file" />
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2cb0261..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-expand_data_decorator_into_java_constructor.patch
-expand_getter_setter_into_plain_java.patch
-remove_excluded_classes_from_ant_plugin_config.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