This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch experimental in repository polyglot-maven.
commit bb2bccf8acb4b0b24718b41550c955ac325f16ef Author: Miguel Landaeta <[email protected]> Date: Sat Jan 21 18:27:14 2017 +0000 Switch from ant to maven --- debian/build.xml | 316 --------------------- debian/changelog | 3 + debian/common-plexus-components.xml | 97 ------- debian/control | 8 +- debian/groovy-plexus-components.xml | 72 ----- debian/libpolyglot-maven-java.poms | 20 +- debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 39 +-- debian/maven.properties | 3 + debian/maven.publishedRules | 1 + debian/maven.rules | 34 +-- .../plexus-component-metadata-plugin-version.diff | 15 + debian/patches/series | 1 + debian/rules | 14 +- 14 files changed, 62 insertions(+), 562 deletions(-) diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 126d502..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,316 +0,0 @@ -<?xml version="1.0"?> -<!-- polyglot-maven 0.8-tobrien-SNAPSHOT build file by gil --> -<project name="polyglot-maven" default="dist" basedir=".."> - - <property name="build.dir" value="build"/> - <property name="dist.dir" value="dist"/> - - <property name="version" value="0.8"/> - - <property name="common.dir" value="${basedir}/pmaven-common"/> - <property name="common.src.dir" value="${common.dir}/src/main/java"/> - <property name="common.build.dir" value="${build.dir}/common"/> - <property name="common.jar" value="${dist.dir}/pmaven-common-${version}.jar"/> - - <property name="groovy.dir" value="${basedir}/pmaven-groovy"/> - <property name="groovy.src.dir" value="${groovy.dir}/src/main"/> - <property name="groovy.doc.src.dir" value="${groovy.dir}/src/main/java"/> - <property name="groovy.build.dir" value="${build.dir}/groovy"/> - <property name="groovy.jar" value="${dist.dir}/pmaven-groovy-${version}.jar"/> - - <!--property name="clojure.dir" value="${basedir}/pmaven-clojure"/> - <property name="clojure.src.dir" value="${clojure.dir}/src/main"/> - <property name="clojure.build.dir" value="${build.dir}/clojure"/> - <property name="clojure.jar" value="${dist.dir}/pmaven-clojure-${version}.jar"/--> - - <target name="clean"> - <delete dir="${build.dir}"/> - <delete dir="${dist.dir}"/> - </target> - - <!-- ,build.clojure --> - <target name="build" - depends="build.common,build.groovy" description="Compile the sources"> - </target> - - <target name="dist" depends="init,build,javadoc" - description="generate the distribution" > - </target> - - <target name="init"> - <mkdir dir="${build.dir}"/> - <mkdir dir="${dist.dir}"/> - </target> - - <path id="groovyc.classpath"> - <fileset dir="/usr/share/java" includes="commons-cli.jar"/> - <fileset dir="/usr/share/java" includes="groovy-all.jar"/> - </path> - - <!--path id="clojurec.classpath"> - <fileset dir="/usr/share/java" includes="clojure.jar"/> - <fileset dir="/usr/share/java" includes="clojure-ant-tasks.jar"/> - </path--> - - <!--path id="clojure.classpath"> - <path refid="clojurec.classpath"/> - <path refid="common.classpath"/> - <fileset dir="/usr/share/java" includes="ant.jar"/> - <fileset dir="/usr/share/java" includes="guava.jar"/> - <fileset dir="${dist.dir}" includes="pmaven-common-${version}.jar"/> - </path--> - - <path id="javadoc.classpath"> - <path refid="groovy.classpath"/> - <fileset dir="${dist.dir}" includes="pmaven-groovy-${version}.jar"/> - </path> - - <path id="common.classpath"> - <path refid="groovyc.classpath"/> - <pathelement location="${core.build.dir}/**"/> - <fileset dir="/usr/share/java" includes="maven-core-3.x.jar"/> - <fileset dir="/usr/share/java" includes="maven-builder-support-3.x.jar"/> - <fileset dir="/usr/share/java" includes="maven-embedder-3.x.jar"/> - <fileset dir="/usr/share/java" includes="maven-model-3.x.jar"/> - <fileset dir="/usr/share/java" includes="maven-model-builder-3.x.jar"/> - <fileset dir="/usr/share/java" includes="plexus-classworlds2.jar"/> - <fileset dir="/usr/share/java" includes="plexus-component-annotations-1.5.jar"/> - <fileset dir="/usr/share/java" includes="plexus-container-default-1.5.jar"/> - <fileset dir="/usr/share/java" includes="plexus-utils2.jar"/> - </path> - - <path id="groovy.classpath"> - <path refid="common.classpath"/> - <pathelement location="${common.build.dir}/**"/> - <fileset dir="${dist.dir}" includes="pmaven-common-${version}.jar"/> - <fileset dir="/usr/share/java" includes="commons-logging.jar"/> - </path> - - <!--target name="build.clojure" description="Build Polyglot Maven clojure Module"> - <mkdir dir="${dist.dir}"/> - <compile-clojure - buildclasspath="clojure.classpath" - dirsrc="${clojure.src.dir}" - destfile="${clojure.build.dir}"/> - - <jar-simple - destfile="${clojure.jar}" - basedir="${clojure.build.dir}" - includes="**/*"/> - </target--> - - <target name="build.common" description="Build Polyglot Maven Common Module"> - <compile-javac - buildclasspath="common.classpath" - dirsrc="${common.src.dir}" - destfile="${common.build.dir}"/> - - <jar-simple - destfile="${common.jar}" - basedir="${common.build.dir}" - includes="**/*"/> - </target> - - <target name="build.groovy" description="Build Polyglot Maven Groovy Module"> - <compile-groovy - buildclasspath="groovy.classpath" - dirsrc="${groovy.src.dir}" - destfile="${groovy.build.dir}"/> - - <jar-simple - destfile="${groovy.jar}" - basedir="${groovy.build.dir}" - includes="**/*"/> - </target> - - <!--taskdef name="clojure-compile" classname="com.ubermensch.ant.clojure.CompileTask" classpathref="clojurec.classpath" /> - <macrodef name="compile-clojure"> - <attribute name="destfile"/> - <attribute name="dirsrc"/> - <attribute name="excludes" default=""/> - <attribute name="includes" default=""/> - <attribute name="buildclasspath" default=""/> - <sequential> - <mkdir dir="@{destfile}"/> - <javac - srcdir="@{dirsrc}/java" - destdir="@{destfile}" - classpathref="@{buildclasspath}" - source="1.5" target="1.5" debug="on"> - </javac> - <clojure-compile compilepath="@{destfile}"> - <classpath> - <pathelement location="@{dirsrc}/clojure" /> - <pathelement location="@{destfile}" /> - <path refid="@{buildclasspath}" /> - </classpath> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.pretty-printer</namespace> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.util</namespace> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.reader</namespace> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.leiningen</namespace> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.writer</namespace> - <namespace>org.sonatype.maven.polyglot.clojure.dsl.debug</namespace> - <fileset dir="@{dirsrc}/clojure" includes="**/*.clj" /> - </clojure-compile> - </sequential> - - <property - name="sources.dir" - value="${base.dir}/sources" - /> - <property - name="build.dir" - value="${base.dir}/build" - /> - <target name="init"> - <property - name="scala-library.jar" - value="${scala.home}/lib/scala-library.jar" - /> - <path id="build.classpath"> - <pathelement location="${scala-library.jar}" /> - <<pathelement location="${your.path}" />> - <pathelement location="${build.dir}" /> - </path> - <taskdef resource="scala/tools/ant/antlib.xml"> - <classpath> - <pathelement location="${scala.home}/lib/scala-compiler.jar" /> - <pathelement location="${scala-library.jar}" /> - </classpath> - </taskdef> - </target> - - <target name="build" depends="init"> - <mkdir dir="${build.dir}" /> - <scalac srcdir="${sources.dir}" - destdir="${build.dir}" - classpathref="build.classpath"> - <include name="compile/**/*.scala" /> - <exclude name="forget/**/*.scala" /> - </scalac> - </target> - <target name="docs" depends="init"> - <mkdir dir="${docs.dir}" /> - <scaladoc - srcdir="${sources.dir}" - destdir="${docs.dir}" - deprecation="yes" unchecked="yes" - windowtitle="Polyglot Maven Scala" - doctitle="<div>liftweb 0.1.0</div>" - classpathref="build.classpath"> - <include name="compile/**/*.scala" /> - </scaladoc> - </target> - - </macrodef--> - - <!--macrodef name="compile-clojure"> - <attribute name="destfile"/> - <attribute name="dirsrc"/> - <attribute name="excludes" default=""/> - <attribute name="includes" default=""/> - <attribute name="buildclasspath" default=""/> - <sequential> - <mkdir dir="@{destfile}"/> - <javac - srcdir="@{dirsrc}/java" - destdir="@{destfile}" - classpathref="@{buildclasspath}" - source="1.5" target="1.5" debug="on"> - </javac> - <java classname="clojure.lang.Compile" - classpathref="clojure.classpath" - fork="true" - failonerror="true"> - <sysproperty key="clojure.compile.path" - value="@{destfile}"/> - <classpath> - <pathelement location="@{dirsrc}/clojure" /> - <pathelement location="@{destfile}" /> - <fileset dir="/usr/share/java" includes="clojure.jar"/> - <path refid="@{buildclasspath}" /> - </classpath> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.pretty-printer"/> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.util"/> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.reader"/> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.leiningen"/> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.writer"/> - <arg value="org.sonatype.maven.polyglot.clojure.dsl.debug"/> - </java> - </sequential> - </macrodef--> - - <macrodef name="compile-javac"> - <attribute name="destfile"/> - <attribute name="dirsrc"/> - <attribute name="excludes" default=""/> - <attribute name="includes" default=""/> - <attribute name="buildclasspath" default=""/> - <sequential> - <mkdir dir="@{destfile}"/> - <javac - srcdir="@{dirsrc}" - destdir="@{destfile}" - classpathref="@{buildclasspath}" - source="1.5" target="1.5" debug="on"> - </javac> - </sequential> - </macrodef> - - <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyc.classpath"/> - <macrodef name="compile-groovy"> - <attribute name="destfile"/> - <attribute name="dirsrc"/> - <attribute name="excludes" default=""/> - <attribute name="includes" default=""/> - <attribute name="buildclasspath" default=""/> - <sequential> - <mkdir dir="@{destfile}"/> - <groovyc - srcdir="@{dirsrc}" - destdir="@{destfile}" - classpathref="@{buildclasspath}" - sourcepath=""> - <javac source="1.5" target="1.5" debug="on"/> - </groovyc> - </sequential> - </macrodef> - - <macrodef name="jar-simple"> - <attribute name="destfile"/> - <attribute name="basedir"/> - <attribute name="excludes" default=""/> - <attribute name="includes" default="**"/> - <attribute name="resources" default=""/> - <attribute name="paramvalue" default=""/> - <sequential> - <jar destfile="@{destfile}" - basedir="@{basedir}" - includes="@{includes}"> - </jar> - </sequential> - </macrodef> - - <target name="javadoc"> - <mkdir dir="${dist.dir}/api"/> - <tstamp> - <format property="year" pattern="yyyy" /> - </tstamp> - <javadoc - destdir="${dist.dir}/api" - sourcepath="${common.src.dir}:${groovy.doc.src.dir}" - access="protected" - old="false" - verbose="false" - version="true" - use="true" - author="true" - windowtitle="Polyglot Maven ${version}"> - <classpath refid="javadoc.classpath"/> - <doctitle><![CDATA[<h2>Polyglot Maven ${version}</h2>]]></doctitle> - <group title="Polyglot Maven Common" packages="org.sonatype.maven.polyglot.*"/> - <group title="Polyglot Maven Groovy" packages="org.sonatype.maven.polyglot.groovy.*"/> - </javadoc> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index ca89daf..065871f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ polyglot-maven (1:0.1.19-1) UNRELEASED; urgency=medium * New upstream release. (Closes: #792149) * Add myself as uploader. + * Switch build system from ant to maven. + * Add patch d/patches/plexus-component-metadata-plugin-version.diff. + * Add B-D on libmaven-invoker-plugin-java. -- Miguel Landaeta <[email protected]> Sat, 21 Jan 2017 18:15:10 +0000 diff --git a/debian/common-plexus-components.xml b/debian/common-plexus-components.xml deleted file mode 100644 index d76c5e9..0000000 --- a/debian/common-plexus-components.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component-set> - <components> - <component> - <role>org.sonatype.maven.polyglot.execute.ExecuteManager</role> - <role-hint>default</role-hint> - <implementation>org.sonatype.maven.polyglot.execute.ExecuteManagerImpl</implementation> - <instantiation-strategy>singleton</instantiation-strategy> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.apache.maven.ArtifactFilterManagerDelegate</role> - <role-hint>polyglot</role-hint> - <implementation>org.sonatype.maven.polyglot.PolyglotArtifactFilterDelegate</implementation> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.sonatype.maven.polyglot.PolyglotModelManager</role> - <role-hint>default</role-hint> - <implementation>org.sonatype.maven.polyglot.PolyglotModelManager</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.mapping.Mapping</role> - <field-name>mappings</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.apache.maven.model.building.ModelProcessor</role> - <role-hint>polyglot</role-hint> - <implementation>org.sonatype.maven.polyglot.PolyglotModelProcessor</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.PolyglotModelManager</role> - <role-hint /> - <field-name>manager</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.apache.maven.classrealm.ClassRealmManagerDelegate</role> - <role-hint>polyglot</role-hint> - <implementation>org.sonatype.maven.polyglot.PolyglotRealmDelegate</implementation> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.sonatype.maven.polyglot.mapping.Mapping</role> - <role-hint>xml</role-hint> - <implementation>org.sonatype.maven.polyglot.mapping.XmlMapping</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.PlexusContainer</role> - <role-hint /> - <field-name>container</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.sonatype.maven.polyglot.PolyglotModelTranslator</role> - <role-hint>default</role-hint> - <implementation>org.sonatype.maven.polyglot.PolyglotModelTranslator</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.PolyglotModelManager</role> - <role-hint /> - <field-name>manager</field-name> - </requirement> - </requirements> - </component> - </components> -</component-set> diff --git a/debian/control b/debian/control index deda8e0..a3e6b0a 100644 --- a/debian/control +++ b/debian/control @@ -4,16 +4,16 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]>, Miguel Landaeta <[email protected]> -Build-Depends: debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.5) -Build-Depends-Indep: ant, - groovy, +Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper +Build-Depends-Indep: groovy, junit4, libcommons-cli-java, libcommons-logging-java, libplexus-classworlds2-java, libplexus-containers1.5-java, libplexus-utils2-java, - libmaven3-core-java (>= 3.3.3-4~) + libmaven3-core-java (>= 3.3.3-4~), + libmaven-invoker-plugin-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/polyglot-maven.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/polyglot-maven.git diff --git a/debian/groovy-plexus-components.xml b/debian/groovy-plexus-components.xml deleted file mode 100644 index be8b9cf..0000000 --- a/debian/groovy-plexus-components.xml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component-set> - <components> - <component> - <role>org.apache.maven.model.io.ModelWriter</role> - <role-hint>groovy</role-hint> - <implementation>org.sonatype.maven.polyglot.groovy.GroovyModelWriter</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.sonatype.maven.polyglot.mapping.Mapping</role> - <role-hint>groovy</role-hint> - <implementation>org.sonatype.maven.polyglot.groovy.GroovyMapping</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.PlexusContainer</role> - <role-hint /> - <field-name>container</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.sonatype.maven.polyglot.groovy.builder.ModelBuilder</role> - <role-hint>default</role-hint> - <implementation>org.sonatype.maven.polyglot.groovy.builder.ModelBuilder</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.execute.ExecuteManager</role> - <role-hint /> - <field-name>executeManager</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.apache.maven.model.io.ModelReader</role> - <role-hint>groovy</role-hint> - <implementation>org.sonatype.maven.polyglot.groovy.GroovyModelReader</implementation> - <isolated-realm>false</isolated-realm> - <requirements> - <requirement> - <role>org.codehaus.plexus.logging.Logger</role> - <role-hint /> - <field-name>log</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.groovy.builder.ModelBuilder</role> - <role-hint /> - <field-name>builder</field-name> - </requirement> - <requirement> - <role>org.sonatype.maven.polyglot.execute.ExecuteManager</role> - <role-hint /> - <field-name>executeManager</field-name> - </requirement> - </requirements> - </component> - </components> -</component-set> diff --git a/debian/libpolyglot-maven-java.poms b/debian/libpolyglot-maven-java.poms index f121542..4647759 100644 --- a/debian/libpolyglot-maven-java.poms +++ b/debian/libpolyglot-maven-java.poms @@ -25,12 +25,14 @@ # --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --no-parent --has-package-version -pmaven-common/pom.xml --has-package-version --java-lib --artifact=dist/pmaven-common-*.jar -pmaven-maven-plugin/pom.xml --ignore -pmaven-atom/pom.xml --ignore -pmaven-groovy/pom.xml --has-package-version --java-lib --artifact=dist/pmaven-groovy-*.jar -pmaven-yaml/pom.xml --ignore -pmaven-clojure/pom.xml --ignore -pmaven-jruby/pom.xml --ignore -pmaven-cli/pom.xml --ignore +pom.xml --no-parent +polyglot-common/pom.xml +polyglot-ruby/pom.xml +polyglot-groovy/pom.xml --ignore +polyglot-maven-plugin/pom.xml +polyglot-atom/pom.xml --ignore +polyglot-scala/pom.xml --ignore +polyglot-yaml/pom.xml --ignore +polyglot-clojure/pom.xml --ignore +polyglot-xml/pom.xml --ignore +polyglot-translate-plugin/pom.xml --ignore diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 4aedcf0..764eaac 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,26 +1,17 @@ -# 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.sonatype.pmaven pmaven-atom jar * * * -org.sonatype.pmaven pmaven-cli jar * * * -org.sonatype.pmaven pmaven-clojure jar * * * -org.sonatype.pmaven pmaven-commands jar * * * -org.sonatype.pmaven pmaven-maven-plugin * * * * -org.sonatype.pmaven pmaven-jruby jar * * * -org.sonatype.pmaven pmaven-yaml jar * * * +de.saumya.mojo gem-maven-plugin * * * * +io.takari.polyglot polyglot-atom * * * * +io.takari.polyglot polyglot-clojure * * * * +io.takari.polyglot polyglot-groovy * * * * +io.takari.polyglot polyglot-maven-plugin * * * * +io.takari.polyglot polyglot-scala * * * * +io.takari.polyglot polyglot-translate-plugin * * * * +io.takari.polyglot polyglot-xml * * * * +io.takari.polyglot polyglot-yaml * * * * org.apache.maven.plugins maven-release-plugin * * * * -org.apache.maven.plugins maven-scm-plugin * * * * -org.codehaus.gmaven gmaven-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.codehaus.groovy groovy-eclipse-batch * * * * +org.codehaus.groovy groovy-eclipse-compiler * * * * +org.eclipse.sisu org.eclipse.sisu.inject.tests * * * * +org.torquebox.mojo mavengem-wagon * * * * +rubygems maven-tools * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..1a9156a --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,3 @@ +# enable the tests once jruby 9.x.x.x is in the archive +# ruby-maven-tools gem is also needed to run the tests +maven.test.skip=true diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1 @@ + diff --git a/debian/maven.rules b/debian/maven.rules index 69ce043..1bc943e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,29 +1,9 @@ -# 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/4\..*/4.x/ * * -org.apache.maven maven-embedder jar s/.*/3.0.4/ * * -org.apache.maven maven-model-builder jar s/.*/3.0.4/ * * -org.apache.maven maven-plugin-api jar s/.*/3.0.4/ * * -org.apache.maven maven pom s/.*/3.0.4/ * * -org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * * -commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * - -org.sonatype.pmaven pmaven-common jar s/.*/debian/ * * -org.sonatype.pmaven pmaven-groovy jar s/.*/debian/ * * -org.sonatype.pmaven pmaven pom s/.*/debian/ * * +org.apache.maven maven-core jar s/.*/3.x/ * * +org.apache.maven maven-model-builder jar s/.*/3.x/ * * +org.apache.maven maven-model jar s/.*/3.x/ * * +org.apache.maven maven * s/.*/3.x/ * * +org.codehaus.plexus plexus-component-metadata maven-plugin * * * +org.codehaus.plexus plexus-utils jar s/.*/2.x/ * * +org.jruby s/jruby/jruby-core/ s/pom/jar/ s/.*/debian/ * * diff --git a/debian/patches/plexus-component-metadata-plugin-version.diff b/debian/patches/plexus-component-metadata-plugin-version.diff new file mode 100644 index 0000000..d62b978 --- /dev/null +++ b/debian/patches/plexus-component-metadata-plugin-version.diff @@ -0,0 +1,15 @@ +Description: Fix maven warnings about missing plugin version +Author: Miguel Landaeta <[email protected]> +Forwarded: no +Last-Update: 2017-01-18 + +--- polyglot-maven-0.1.19.orig/pom.xml ++++ polyglot-maven-0.1.19/pom.xml +@@ -171,6 +171,7 @@ + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> ++ <version>1.5.5</version> + <executions> + <execution> + <goals> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..949c100 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +plexus-component-metadata-plugin-version.diff diff --git a/debian/rules b/debian/rules index 4deb450..c00a8f8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,6 @@ #!/usr/bin/make -f - -export JAVA_HOME := /usr/lib/jvm/default-java -export ANT_ARGS := -f debian/build.xml -VERSION=$(shell dpkg-parsechangelog | sed -n '/^Version/s/Version: \(.*\)-[^-]*$$/\1/p') - %: - dh $@ --buildsystem=ant --with maven_repo_helper - -override_dh_auto_build: - mkdir -p build/common/META-INF/plexus - cp -p debian/common-plexus-components.xml build/common/META-INF/plexus/components.xml - mkdir -p build/groovy/META-INF/plexus - cp -p debian/groovy-plexus-components.xml build/groovy/META-INF/plexus/components.xml - dh_auto_build + dh $@ --buildsystem=maven get-orig-source: git clone git://github.com/tobrien/polyglot-maven.git polyglot-maven-$(VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/polyglot-maven.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
