[plexus-compiler] 02/02: WIP
Miguel Landaeta
nomadium at moszumanska.debian.org
Tue Mar 3 02:55:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository plexus-compiler.
commit 95f4bf757d749daa5104fd7ee07cd8f739e4647e
Author: Miguel Landaeta <nomadium at debian.org>
Date: Mon Mar 2 23:56:14 2015 -0300
WIP
---
debian/changelog | 17 +++++++++++++++++
debian/control | 2 +-
debian/maven.cleanIgnoreRules | 16 ----------------
debian/maven.ignoreRules | 15 ---------------
debian/maven.publishedRules | 18 ------------------
debian/maven.rules | 19 ++-----------------
debian/patches/backward-compatibility.patch | 22 ----------------------
debian/patches/eclipse-compatibility.patch | 2 +-
debian/patches/fix_test_classpath.patch | 2 +-
debian/patches/series | 1 -
debian/rules | 2 +-
debian/watch | 4 ++--
plexus-compiler-api/pom.xml | 3 +++
plexus-compilers/plexus-compiler-javac/pom.xml | 1 +
plexus-compilers/pom.xml | 1 +
15 files changed, 30 insertions(+), 95 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b14b8cb..dea9887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+plexus-compiler (2.0-1) UNRELEASED; urgency=medium
+
+ WIP: I'm working on this package since I need it to update
+ maven-compiler-plugin. This is meant to be uploaded to experimental.
+
+ * Team upload.
+ * New upstream release.
+ * Update d/watch file.
+ * Bump Standards-Version to 3.9.6. No changes were required.
+ * Refresh patches:
+ - d/patches/eclipse-compatibility.patch.
+ - d/patches/fix_test_classpath.patch.
+ * Drop unneeded patch:
+ - d/patches/backward-compatibility.patch.
+
+ -- Miguel Landaeta <nomadium at debian.org> Mon, 02 Mar 2015 23:55:40 -0300
+
plexus-compiler (1.9.2-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 99519c6..5bf0df9 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep: default-jdk-doc,
libplexus-container-default-java-doc,
libplexus-utils-java (>= 1.5.15),
libplexus-utils-java-doc
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-compiler.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-compiler.git
Homepage: http://plexus.codehaus.org/plexus-components/plexus-compiler/
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index d9825b6..8b13789 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -1,17 +1 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-# junit junit jar s/3\..*/3.x/
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index a555a53..74a357d 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,17 +1,2 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-# junit junit jar s/3\..*/3.x/
org.apache.maven.plugins maven-gpg-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 77aa245..8b13789 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1,19 +1 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\..*/3.x/
diff --git a/debian/maven.rules b/debian/maven.rules
index ca878f3..0271d65 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,21 +1,6 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\..*/3.x/
junit junit jar s/.*/3.x/ * *
+junit junit jar s/3\..*/3.x/ * *
+org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * *
org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
s/org.eclipse.jdt/org.eclipse.jdt.core.compiler/ s/core/ecj/ jar s/.*/debian/ * *
diff --git a/debian/patches/backward-compatibility.patch b/debian/patches/backward-compatibility.patch
deleted file mode 100644
index 9a64085..0000000
--- a/debian/patches/backward-compatibility.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fixes an incompatibility introduced in plexus-compiler 1.8.1 and
- affecting maven-stapler-plugin. This patch can be dropped after upgrading
- maven-stapler-plugin to 1.17 or later.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
-index 8d62968..7dd1163 100644
---- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
-+++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
-@@ -579,6 +579,11 @@ public class JavacCompiler
- return messages;
- }
-
-+ protected static List<CompilerError> parseModernStream( BufferedReader input ) throws IOException
-+ {
-+ return parseModernStream(1, input);
-+ }
-+
- /**
- * Parse the output from the compiler into a list of CompilerError objects
- *
-
diff --git a/debian/patches/eclipse-compatibility.patch b/debian/patches/eclipse-compatibility.patch
index 9692a57..20886cc 100644
--- a/debian/patches/eclipse-compatibility.patch
+++ b/debian/patches/eclipse-compatibility.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
-@@ -404,6 +404,11 @@
+@@ -388,6 +388,11 @@
return result;
}
diff --git a/debian/patches/fix_test_classpath.patch b/debian/patches/fix_test_classpath.patch
index e9f810d..449818e 100644
--- a/debian/patches/fix_test_classpath.patch
+++ b/debian/patches/fix_test_classpath.patch
@@ -1,6 +1,6 @@
--- a/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
+++ b/plexus-compiler-test/src/main/java/org/codehaus/plexus/compiler/AbstractCompilerTest.java
-@@ -68,7 +68,7 @@
+@@ -74,7 +74,7 @@
{
List<String> cp = new ArrayList<String>();
diff --git a/debian/patches/series b/debian/patches/series
index 8163a2a..43f99f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
fix_test_classpath.patch
eclipse-compatibility.patch
-backward-compatibility.patch
set-dependencies-versions.patch
diff --git a/debian/rules b/debian/rules
index ba49f3e..ec3998e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/maven.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+DEB_MAVEN_DOC_TARGET := install javadoc:aggregate
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
diff --git a/debian/watch b/debian/watch
index f733479..0764d34 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts=dversionmangle=s/\+dfsg//,uversionmangle=s/_/./ \
-http://githubredir.debian.net/github/sonatype/plexus-compiler/ plexus-compiler-(.*).tar.gz
+https://github.com/sonatype/plexus-compiler/releases \
+ /sonatype/plexus-compiler/archive/plexus-compiler-(\d.+)\.tar\.gz
diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml
index d914367..8ea10bc 100644
--- a/plexus-compiler-api/pom.xml
+++ b/plexus-compiler-api/pom.xml
@@ -17,10 +17,13 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>debian</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.x</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml
index 9c70e13..03f491a 100644
--- a/plexus-compilers/plexus-compiler-javac/pom.xml
+++ b/plexus-compilers/plexus-compiler-javac/pom.xml
@@ -17,6 +17,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>debian</version>
</dependency>
</dependencies>
diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml
index a1d7d21..3e2a90b 100644
--- a/plexus-compilers/pom.xml
+++ b/plexus-compilers/pom.xml
@@ -25,6 +25,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.x</version>
<scope>test</scope>
</dependency>
<dependency>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-compiler.git
More information about the pkg-java-commits
mailing list