[Git][java-team/ivyplusplus][master] 7 commits: Standards-Version updated to 4.5.1
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jan 19 10:32:12 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / ivyplusplus
Commits:
b9909137 by Emmanuel Bourg at 2021-01-19T11:18:48+01:00
Standards-Version updated to 4.5.1
- - - - -
839c9cc9 by Emmanuel Bourg at 2021-01-19T11:18:54+01:00
Switch to debhelper level 13
- - - - -
50a15754 by Emmanuel Bourg at 2021-01-19T11:20:24+01:00
New upstream version 1.30
- - - - -
8152d7c0 by Emmanuel Bourg at 2021-01-19T11:20:32+01:00
New upstream version 1.32
- - - - -
08b2121d by Emmanuel Bourg at 2021-01-19T11:20:33+01:00
Update upstream source from tag 'upstream/1.32'
Update to upstream version '1.32'
with Debian dir 43fffbf695445250aa8e1fe330fb242c47b629db
- - - - -
490d672c by Emmanuel Bourg at 2021-01-19T11:24:41+01:00
Refreshed the patches
- - - - -
5bdd7a8d by Emmanuel Bourg at 2021-01-19T11:31:48+01:00
Upload to unstable
- - - - -
20 changed files:
- README.markdown
- − buildScripts/ivy-repo/com.zwitserloot-cmdreader-1.5.xml
- buildScripts/ivy-repo/org.projectlombok-jsch-ant-fixed-0.1.42.xml
- buildScripts/ivy.xml
- buildScripts/ivysettings.xml
- buildScripts/maven-pom.xml
- debian/changelog
- − debian/compat
- debian/control
- − debian/patches/add-javac-release-option.patch
- − debian/patches/ant-compatibility.patch
- debian/patches/series
- src/com/zwitserloot/ivyplusplus/Compile.java
- src/com/zwitserloot/ivyplusplus/Version.java
- src/com/zwitserloot/ivyplusplus/createProject/build.xml.template
- src/com/zwitserloot/ivyplusplus/createProject/ivysettings.xml.template
- src/com/zwitserloot/ivyplusplus/createProject/maven-pom.xml.template
- src/com/zwitserloot/ivyplusplus/ecj/EcjAdapter.java
- src/com/zwitserloot/ivyplusplus/eclipse/BuildEclipseProject.java
- src/com/zwitserloot/ivyplusplus/eclipse/Settings.java
Changes:
=====================================
README.markdown
=====================================
@@ -1,6 +1,6 @@
# com.zwitserloot.ivyplusplus
-`com.zwitserloot.ivyplusplus` is a jar containing [Apache Ivy](http://ant.apache.org/ivy/) as well as a few useful constructs built on top of it.
+`com.zwitserloot.ivyplusplus` is a jar containing [Apache Ivy](https://ant.apache.org/ivy/) as well as a few useful constructs built on top of it..
Aside from ivy itself, you get a few extra tasks and a command line tool that creates a new project by filling out a skeleton build.xml and ivy configuration.
@@ -49,7 +49,7 @@ Example:
<srcdir dir="test" />
</module>
<settings>
- <url url="http://projectlombok.org/downloads/lombok.intellij.settings" />
+ <url url="https://projectlombok.org/downloads/lombok.intellij.settings" />
</settings>
<apt enabled="true" />
</ivy:intellijgen>
@@ -95,7 +95,7 @@ Example:
<conf name="build" sources="contrib" />
<conf name="test" sources="contrib" />
<settings>
- <url url="http://projectlombok.org/downloads/lombok.eclipse.settings" />
+ <url url="https://projectlombok.org/downloads/lombok.eclipse.settings" />
org.eclipse.jdt.core.formatter.lineSplit=100
</settings>
</ivy:eclipsegen>
@@ -178,7 +178,7 @@ _Supported since ipp 1.0_
Attributes:
-* `url` - list the base URL where the repository is located. Example: `http://projectlombok.org/mavenrepo`
+* `url` - list the base URL where the repository is located. Example: `https://projectlombok.org/mavenrepo`
* `group` - group name. Example: `org.projectlombok`
* `artifact` - artifact name. Example: `lombok`
* `version` - this version. make-maven-repo won't work if this version name is already available from the repository.
=====================================
buildScripts/ivy-repo/com.zwitserloot-cmdreader-1.5.xml deleted
=====================================
@@ -1,15 +0,0 @@
-<ivy-module version="2.0">
- <info organisation="com.zwitserloot" module="cmdreader" revision="1.5" publication="20110316060000">
- <license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
- <ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
- <description homepage="http://github.com/rzwitserloot/com.zwitserloot.cmdreader" />
- </info>
- <configurations>
- <conf name="default" />
- <conf name="sources" />
- </configurations>
- <publications>
- <artifact conf="default" url="http://cloud.github.com/downloads/rzwitserloot/com.zwitserloot.cmdreader/com.zwitserloot.cmdreader-1.5.jar" />
- <artifact type="zip" conf="sources" url="http://cloud.github.com/downloads/rzwitserloot/com.zwitserloot.cmdreader/com.zwitserloot.cmdreader-src-1.5.zip" />
- </publications>
-</ivy-module>
=====================================
buildScripts/ivy-repo/org.projectlombok-jsch-ant-fixed-0.1.42.xml
=====================================
@@ -7,6 +7,6 @@
<conf name="build" />
</configurations>
<publications>
- <artifact conf="build" url="http://projectlombok.org/ivyrepo/tools/ant-jsch-fixed.jar" />
+ <artifact conf="build" url="https://projectlombok.org/ivyrepo/tools/ant-jsch-fixed.jar" />
</publications>
</ivy-module>
=====================================
buildScripts/ivy.xml
=====================================
@@ -7,8 +7,9 @@
<conf name="contrib" />
</configurations>
<dependencies>
+ <dependency org="com.jcraft" name="jsch" rev="0.1.55" conf="build->default" />
<dependency org="org.projectlombok" name="jsch-ant-fixed" rev="0.1.42" conf="build" />
- <dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->master; contrib->sources" />
+ <dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="build->master; contrib->sources" />
<dependency org="org.apache.ivy" name="ivy" rev="2.4.0" conf="build->master; contrib->sources" />
<dependency org="com.zwitserloot" name="cmdreader" rev="1.5" conf="build, runtime->default" />
<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" conf="build->default" />
=====================================
buildScripts/ivysettings.xml
=====================================
@@ -4,8 +4,8 @@
<filesystem name="projectLocalRepo">
<ivy pattern="${ivy.settings.dir}/ivy-repo/[organisation]-[module]-[revision].xml" />
</filesystem>
- <ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2" />
- <ibiblio name="maven-repo2" m2compatible="true" root="http://uk.maven.org/maven2" />
+ <ibiblio name="maven-repo2" m2compatible="true" root="https://repo2.maven.org/maven2" />
+ <ibiblio name="maven-repo2" m2compatible="true" root="https://repo1.maven.org/maven2" />
</chain>
</resolvers>
<settings defaultResolver="projectRepos" />
=====================================
buildScripts/maven-pom.xml
=====================================
@@ -6,13 +6,13 @@
<packaging>jar</packaging>
<version>@VERSION@</version>
<name>IvyPlusPlus</name>
- <url>http://zwitserloot.com/ivyplusplus</url>
+ <url>https://zwitserloot.com/ivyplusplus</url>
<description>Adds some useful features to ant based on ivy, such as building an eclipse project based on your dependencies.</description>
<dependencies></dependencies>
<licenses>
<license>
<name>The MIT License</name>
- <url>http://www.opensource.org/licenses/mit-license.php</url>
+ <url>https://www.opensource.org/licenses/mit-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ivyplusplus (1.32-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 19 Jan 2021 11:31:40 +0100
+
ivyplusplus (1.28-3) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -6,14 +6,14 @@ Build-Depends:
ant,
ant-optional,
cmdreader,
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
ivy,
javahelper,
libeclipse-jdt-core-java,
libjarjar-java,
liblombok-java (>= 1.16.22)
-Standards-Version: 4.3.0
+Standards-Version: 4.5.1
Vcs-Git: https://salsa.debian.org/java-team/ivyplusplus.git
Vcs-Browser: https://salsa.debian.org/java-team/ivyplusplus
Homepage: https://github.com/rzwitserloot/ivyplusplus
=====================================
debian/patches/add-javac-release-option.patch deleted
=====================================
@@ -1,13 +0,0 @@
-Description: Adds the release option supported by the javac Ant task
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://github.com/rzwitserloot/ivyplusplus/pull/5
---- a/src/com/zwitserloot/ivyplusplus/Compile.java
-+++ b/src/com/zwitserloot/ivyplusplus/Compile.java
-@@ -110,6 +110,7 @@
- m.put("deprecation", "deprecation");
- m.put("target", "target");
- m.put("source", "source");
-+ m.put("release", "release");
- m.put("verbose", "verbose");
- m.put("depend", "depend");
- m.put("includeantruntime", "includeantruntime");
=====================================
debian/patches/ant-compatibility.patch deleted
=====================================
@@ -1,47 +0,0 @@
-Description: Fixes the compatibility with the version of Ant in Debian
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/src/com/zwitserloot/ivyplusplus/ecj/EcjAdapter.java
-+++ b/src/com/zwitserloot/ivyplusplus/ecj/EcjAdapter.java
-@@ -21,6 +21,7 @@
- import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
- import org.apache.tools.ant.taskdefs.condition.Os;
- import org.apache.tools.ant.types.Path;
-+import org.apache.tools.ant.types.Resource;
- import org.apache.tools.ant.types.resources.FileResource;
- import org.eclipse.jdt.core.compiler.CategorizedProblem;
- import org.eclipse.jdt.internal.compiler.Compiler;
-@@ -259,11 +260,13 @@
- }
-
- if (javac.getClasspath() != null) {
-- Iterator<FileResource> iterator = javac.getClasspath().iterator();
-+ Iterator<Resource> iterator = javac.getClasspath().iterator();
- while (iterator.hasNext()) {
-- FileResource fileResource = iterator.next();
-- File classesFile = fileResource.getFile();
-- if (classesFile.exists()) classpathList.add(FileSystem.getClasspath(classesFile.toString(), "UTF-8", null));
-+ Resource fileResource = iterator.next();
-+ if (fileResource instanceof FileResource) {
-+ File classesFile = ((FileResource) fileResource).getFile();
-+ if (classesFile.exists()) classpathList.add(FileSystem.getClasspath(classesFile.toString(), "UTF-8", null));
-+ }
- }
- }
-
-@@ -275,9 +278,12 @@
- Path bootClasspath = javac.getBootclasspath();
-
- // Step 2: iterate over the boot class path entries as specified in the ant path
-- for (Iterator<FileResource> iterator = bootClasspath.iterator(); iterator.hasNext();) {
-- FileResource fileResource = iterator.next();
-- if (fileResource.getFile().exists()) classpaths.add(FileSystem.getClasspath(fileResource.getFile().toString(), "UTF-8", null));
-+ for (Iterator<Resource> iterator = bootClasspath.iterator(); iterator.hasNext();) {
-+ Resource fileResource = iterator.next();
-+ if (fileResource instanceof FileResource) {
-+ File file = ((FileResource) fileResource).getFile();
-+ if (file.exists()) classpaths.add(FileSystem.getClasspath(file.toString(), "UTF-8", null));
-+ }
- }
- }
-
=====================================
debian/patches/series
=====================================
@@ -1,3 +1 @@
exclude-unsupported-classes-from-antlib.xml.patch
-ant-compatibility.patch
-add-javac-release-option.patch
=====================================
src/com/zwitserloot/ivyplusplus/Compile.java
=====================================
@@ -110,6 +110,7 @@ public class Compile extends MatchingTask implements DynamicAttribute {
m.put("deprecation", "deprecation");
m.put("target", "target");
m.put("source", "source");
+ m.put("release", "release");
m.put("verbose", "verbose");
m.put("depend", "depend");
m.put("includeantruntime", "includeantruntime");
=====================================
src/com/zwitserloot/ivyplusplus/Version.java
=====================================
@@ -1,5 +1,5 @@
/**
- * Copyright © 2010-2018 Reinier Zwitserloot.
+ * Copyright © 2010-2019 Reinier Zwitserloot.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@ package com.zwitserloot.ivyplusplus;
public class Version {
// ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries).
- private static final String VERSION = "1.28";
+ private static final String VERSION = "1.32";
private Version() {
//Prevent instantiation
=====================================
src/com/zwitserloot/ivyplusplus/createProject/build.xml.template
=====================================
@@ -13,7 +13,7 @@
<property name="jre.version" value="1.8" />
<property name="build.compiler" value="javac${jre.version}" />
<property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" />
- <property name="ivyplusplus.location" value="http://projectlombok.org/downloads/ivyplusplus.jar" />
+ <property name="ivyplusplus.location" value="https://projectlombok.org/downloads/ivyplusplus.jar" />
<available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
<path id="build.path">
@@ -192,7 +192,7 @@
<mkdir dir="doc/api" />
<javadoc sourcepath="src/main" defaultexcludes="yes" destdir="doc/api" windowtitle="{{@PROJECTNAME}}">
<classpath refid="build.path" />
- <link href="http://java.sun.com/javase/6/docs/api/" />
+ <link href="https://docs.oracle.com/javase/8/docs/api/" />
</javadoc>
</target>
@@ -215,7 +215,7 @@
{{end JUNIT}}
</module>
<settings>
- <url url="http://projectlombok.org/downloads/lombok.intellij.settings" />
+ <url url="https://projectlombok.org/downloads/lombok.intellij.settings" />
</settings>
</ivy:intellijgen>
</target>
@@ -231,7 +231,7 @@
<conf name="test" sources="contrib" />
{{end JUNIT}}
<settings>
- <url url="http://projectlombok.org/downloads/lombok.eclipse.settings" />
+ <url url="https://projectlombok.org/downloads/lombok.eclipse.settings" />
</settings>
</ivy:eclipsegen>
</target>
=====================================
src/com/zwitserloot/ivyplusplus/createProject/ivysettings.xml.template
=====================================
@@ -4,8 +4,8 @@
<filesystem name="projectLocalRepo">
<ivy pattern="${ivy.settings.dir}/ivy-repo/[organisation]-[module]-[revision].xml" />
</filesystem>
- <ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2" />
- <ibiblio name="maven-repo2" m2compatible="true" root="http://uk.maven.org/maven2" />
+ <ibiblio name="maven-repo2" m2compatible="true" root="https://repo2.maven.org/maven2" />
+ <ibiblio name="maven-repo2" m2compatible="true" root="https://repo1.maven.org/maven2" />
</chain>
</resolvers>
<settings defaultResolver="projectRepos" />
=====================================
src/com/zwitserloot/ivyplusplus/createProject/maven-pom.xml.template
=====================================
@@ -27,8 +27,8 @@
<url>scm:git:git://github.com/!!git username here!!/!!gitname here!!.git</url>
</scm>
<issueManagement>
- <system>Google Code</system>
- <url>http://code.google.com/p/!!projectname here!!/issues</url>
+ <system>GitHub</system>
+ <url>https://github.com/!!username!!/!!projectname!!/issues</url>
</issueManagement>
<developers>
<developer>
=====================================
src/com/zwitserloot/ivyplusplus/ecj/EcjAdapter.java
=====================================
@@ -21,6 +21,7 @@ import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.resources.FileResource;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
import org.eclipse.jdt.internal.compiler.Compiler;
@@ -259,9 +260,10 @@ public class EcjAdapter implements CompilerAdapter {
}
if (javac.getClasspath() != null) {
- Iterator<FileResource> iterator = javac.getClasspath().iterator();
+ Iterator<? extends Resource> iterator = javac.getClasspath().iterator();
while (iterator.hasNext()) {
- FileResource fileResource = iterator.next();
+ FileResource fileResource = iterator.next().as(FileResource.class);
+ if (fileResource == null) continue;
File classesFile = fileResource.getFile();
if (classesFile.exists()) classpathList.add(FileSystem.getClasspath(classesFile.toString(), "UTF-8", null));
}
@@ -275,8 +277,9 @@ public class EcjAdapter implements CompilerAdapter {
Path bootClasspath = javac.getBootclasspath();
// Step 2: iterate over the boot class path entries as specified in the ant path
- for (Iterator<FileResource> iterator = bootClasspath.iterator(); iterator.hasNext();) {
- FileResource fileResource = iterator.next();
+ for (Iterator<? extends Resource> iterator = bootClasspath.iterator(); iterator.hasNext();) {
+ FileResource fileResource = iterator.next().as(FileResource.class);
+ if (fileResource == null) continue;
if (fileResource.getFile().exists()) classpaths.add(FileSystem.getClasspath(fileResource.getFile().toString(), "UTF-8", null));
}
}
=====================================
src/com/zwitserloot/ivyplusplus/eclipse/BuildEclipseProject.java
=====================================
@@ -1,5 +1,5 @@
/**
- * Copyright © 2010-2018 Reinier Zwitserloot.
+ * Copyright © 2010-2019 Reinier Zwitserloot.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -311,6 +311,11 @@ public class BuildEclipseProject extends IvyPostResolveTask {
private static final Map<String, String> SOURCE_TO_CON;
static {
Map<String, String> map = new LinkedHashMap<String, String>();
+ map.put("13", "JavaSE-13");
+ map.put("12", "JavaSE-12");
+ map.put("11", "JavaSE-11");
+ map.put("10", "JavaSE-10");
+ map.put("9", "JavaSE-9");
map.put("1.8", "JavaSE-1.8");
map.put("1.7", "JavaSE-1.7");
map.put("1.6", "JavaSE-1.6");
=====================================
src/com/zwitserloot/ivyplusplus/eclipse/Settings.java
=====================================
@@ -84,10 +84,17 @@ public class Settings {
}
public void execute(File todir, Location location, String source) {
- boolean is5 = "1.5".equals(source);
- boolean is6 = "1.6".equals(source);
- boolean is7 = "1.7".equals(source);
- boolean is8 = "1.8".equals(source);
+ int v;
+ if ("1.5".equals(source)) v = 5;
+ else if ("1.6".equals(source)) v = 6;
+ else if ("1.7".equals(source)) v = 7;
+ else if ("1.8".equals(source)) v = 8;
+ else if ("9".equals(source)) v = 9;
+ else if ("10".equals(source)) v = 10;
+ else if ("11".equals(source)) v = 11;
+ else if ("12".equals(source)) v = 12;
+ else if ("13".equals(source)) v = 13;
+ else v = 4;
todir = new File(todir, ".settings");
@@ -118,20 +125,20 @@ public class Settings {
}
if (!properties.containsKey("org.eclipse.jdt.core.compiler.processAnnotations")) {
- if (is5) properties.put("org.eclipse.jdt.core.compiler.processAnnotations", "disabled");
- if (is6 || is7 || is8) properties.put("org.eclipse.jdt.core.compiler.processAnnotations", "enabled");
+ if (v < 6) properties.put("org.eclipse.jdt.core.compiler.processAnnotations", "disabled");
+ if (v > 5) properties.put("org.eclipse.jdt.core.compiler.processAnnotations", "enabled");
}
if (!properties.containsKey("org.eclipse.jdt.core.compiler.source")) {
- if (is5 || is6 || is7 || is8) properties.put("org.eclipse.jdt.core.compiler.source", source);
+ if (v > 4) properties.put("org.eclipse.jdt.core.compiler.source", source);
}
if (!properties.containsKey("org.eclipse.jdt.core.compiler.compliance")) {
- if (is5 || is6 || is7 || is8) properties.put("org.eclipse.jdt.core.compiler.compliance", source);
+ if (v > 4) properties.put("org.eclipse.jdt.core.compiler.compliance", source);
}
if (!properties.containsKey("org.eclipse.jdt.core.compiler.codegen.targetPlatform")) {
- if (is5 || is6 || is7 || is8) properties.put("org.eclipse.jdt.core.compiler.codegen.targetPlatform", source);
+ if (v > 4) properties.put("org.eclipse.jdt.core.compiler.codegen.targetPlatform", source);
}
try {
View it on GitLab: https://salsa.debian.org/java-team/ivyplusplus/-/compare/c26bb816b6d84527def170d734200eb7133ef28e...5bdd7a8d57d477330b638f0e00e226a6d686613d
--
View it on GitLab: https://salsa.debian.org/java-team/ivyplusplus/-/compare/c26bb816b6d84527def170d734200eb7133ef28e...5bdd7a8d57d477330b638f0e00e226a6d686613d
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/20210119/19f99405/attachment.html>
More information about the pkg-java-commits
mailing list