This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-reporting-exec.
commit 04909b6550f6efde2007019663512b8d62670257 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 15:17:14 2017 +0200 Initial packaging --- debian/README.source | 9 +++++ debian/changelog | 5 +++ debian/compat | 1 + debian/control | 41 +++++++++++++++++++ debian/copyright | 15 +++++++ debian/libmaven-reporting-exec-java.poms | 28 +++++++++++++ debian/maven.ignoreRules | 6 +++ debian/maven.properties | 5 +++ debian/maven.rules | 8 ++++ debian/orig-tar.sh | 10 +++++ debian/patches/01-maven-compatibility.patch | 61 +++++++++++++++++++++++++++++ debian/patches/02-maven-compatibility.patch | 23 +++++++++++ debian/patches/series | 1 + debian/rules | 7 ++++ debian/source/format | 1 + debian/watch | 2 + 16 files changed, 223 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..62c23f7 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about maven-reporting-exec +-------------------------------------- + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a8eccf7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +maven-reporting-exec (1.3-1) unstable; urgency=medium + + * Initial release. (Closes: #869985) + + -- Emmanuel Bourg <[email protected]> Fri, 28 Jul 2017 15:17:04 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..cec5901 --- /dev/null +++ b/debian/control @@ -0,0 +1,41 @@ +Source: maven-reporting-exec +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Emmanuel Bourg <[email protected]> +Build-Depends: + debhelper (>= 10), + default-jdk, + junit4, + libdoxia-core-java, + libmaven3-core-java (>= 3.5.0), + libplexus-component-annotations-java, + libplexus-component-metadata-java, + maven-debian-helper (>= 2.2), + velocity +Standards-Version: 4.0.0 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-reporting-exec.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-reporting-exec.git +Homepage: http://maven.apache.org/shared/maven-reporting-exec/ + +Package: libmaven-reporting-exec-java +Architecture: all +Depends: ${maven:Depends}, ${misc:Depends} +Suggests: ${maven:OptionalDepends} +Description: Apache Maven Reporting Executor + Maven is a software project management and comprehension tool. Based on the + concept of a project object model (POM), Maven can manage a project's build, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features + . + This package provides classes to manage report plugin executions with Maven 3. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9392404 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,15 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Apache Maven Reporting Executor +Source: http://maven.apache.org/shared/maven-reporting-exec/ + +Files: * +Copyright: 2011-2016, The Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2017, Emmanuel Bourg <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' diff --git a/debian/libmaven-reporting-exec-java.poms b/debian/libmaven-reporting-exec-java.poms new file mode 100644 index 0000000..5ad70f2 --- /dev/null +++ b/debian/libmaven-reporting-exec-java.poms @@ -0,0 +1,28 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --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 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..b7803f7 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,6 @@ +org.apache.maven.plugins maven-enforcer-plugin +org.apache.maven.plugins maven-invoker-plugin +org.apache.maven.plugin-testing maven-plugin-testing-harness +org.sonatype.aether aether-api +org.sonatype.aether aether-connector-wagon +org.sonatype.aether aether-util diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..3e1c805 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,8 @@ + +junit junit * s/.*/4.x/ * * +org.codehaus.plexus plexus-component-metadata maven-plugin s/1.6/1.5.5/ * * +org.apache.maven maven-* * s/.*/3.x/ * * +s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * * + +s/org.eclipse.aether/org.apache.maven.resolver/ s/aether-api/maven-resolver-api/ * s/.*/debian/ * * +s/org.eclipse.aether/org.apache.maven.resolver/ s/aether-util/maven-resolver-util/ * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..6e1b5cf --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,10 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../maven-reporting-exec_$VERSION.orig.tar.xz +DIR=maven-reporting-exec-$VERSION +TAG=$(echo "maven-reporting-exec-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') + +svn export http://svn.apache.org/repos/asf/maven/shared/tags/${TAG}/ $DIR +XZ_OPT=--best tar -c -J -f $TAR $DIR +rm -rf $DIR ../$TAG diff --git a/debian/patches/01-maven-compatibility.patch b/debian/patches/01-maven-compatibility.patch new file mode 100644 index 0000000..acd11f8 --- /dev/null +++ b/debian/patches/01-maven-compatibility.patch @@ -0,0 +1,61 @@ +Description: Fixes the compatibility with the version of Maven in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java ++++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +@@ -44,11 +44,11 @@ + import org.codehaus.plexus.classworlds.realm.ClassRealm; + import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + import org.codehaus.plexus.logging.Logger; +-import org.sonatype.aether.RepositorySystemSession; +-import org.sonatype.aether.artifact.Artifact; +-import org.sonatype.aether.repository.RemoteRepository; +-import org.sonatype.aether.repository.WorkspaceReader; +-import org.sonatype.aether.repository.WorkspaceRepository; ++import org.eclipse.aether.RepositorySystemSession; ++import org.eclipse.aether.artifact.Artifact; ++import org.eclipse.aether.repository.RemoteRepository; ++import org.eclipse.aether.repository.WorkspaceReader; ++import org.eclipse.aether.repository.WorkspaceRepository; + + import java.io.File; + import java.util.Collections; +@@ -231,7 +231,7 @@ + return localArtifactRepository; + } + String localRepoPath = +- System.getProperty( "localRepository", MavenCli.userMavenConfigurationHome.getPath() + "/repository" ); ++ System.getProperty( "localRepository", MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository" ); + + localArtifactRepository = lookup( RepositorySystem.class ).createLocalRepository( new File( localRepoPath ) ); + return localArtifactRepository; +@@ -243,9 +243,9 @@ + + SettingsBuildingRequest settingsBuildingRequest = new DefaultSettingsBuildingRequest(); + +- settingsBuildingRequest.setGlobalSettingsFile( MavenCli.DEFAULT_GLOBAL_SETTINGS_FILE ); ++ settingsBuildingRequest.setGlobalSettingsFile( org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE ); + +- settingsBuildingRequest.setUserSettingsFile( MavenCli.DEFAULT_USER_SETTINGS_FILE ); ++ settingsBuildingRequest.setUserSettingsFile( org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE ); + + settingsBuildingRequest.getSystemProperties().putAll( System.getProperties() ); + +--- a/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java ++++ b/src/main/java/org/apache/maven/reporting/exec/DefaultMavenPluginManagerHelper.java +@@ -115,14 +115,7 @@ + + private Object createExclusionsDependencyFilter( List<String> artifactIdsList ) + { +- if ( isEclipseAether() ) +- { +- return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); +- } +- else +- { +- return new org.sonatype.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); +- } ++ return new org.eclipse.aether.util.filter.ExclusionsDependencyFilter( artifactIdsList ); + } + + public PluginDescriptor getPluginDescriptor( Plugin plugin, MavenSession session ) diff --git a/debian/patches/02-maven-compatibility.patch b/debian/patches/02-maven-compatibility.patch new file mode 100644 index 0000000..a56256c --- /dev/null +++ b/debian/patches/02-maven-compatibility.patch @@ -0,0 +1,23 @@ +--- a/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java ++++ b/src/test/java/org/apache/maven/reporting/exec/TestDefaultMavenReportExecutor.java +@@ -231,7 +231,7 @@ + return localArtifactRepository; + } + String localRepoPath = +- System.getProperty( "localRepository", MavenCli.userMavenConfigurationHome.getPath() + "/repository" ); ++ System.getProperty( "localRepository", MavenCli.USER_MAVEN_CONFIGURATION_HOME.getPath() + "/repository" ); + + localArtifactRepository = lookup( RepositorySystem.class ).createLocalRepository( new File( localRepoPath ) ); + return localArtifactRepository; +@@ -243,9 +243,9 @@ + + SettingsBuildingRequest settingsBuildingRequest = new DefaultSettingsBuildingRequest(); + +- settingsBuildingRequest.setGlobalSettingsFile( MavenCli.DEFAULT_GLOBAL_SETTINGS_FILE ); ++ settingsBuildingRequest.setGlobalSettingsFile( org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor.DEFAULT_GLOBAL_SETTINGS_FILE ); + +- settingsBuildingRequest.setUserSettingsFile( MavenCli.DEFAULT_USER_SETTINGS_FILE ); ++ settingsBuildingRequest.setUserSettingsFile( org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor.DEFAULT_USER_SETTINGS_FILE ); + + settingsBuildingRequest.getSystemProperties().putAll( System.getProperties() ); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..09d1b63 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-maven-compatibility.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5a6351f --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +%: + dh $@ + +get-orig-source: + uscan --download-current-version --force-download --rename diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..35a840b --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://svn.apache.org/repos/asf/maven/shared/tags/ maven-reporting-exec-([\d\.]+)/ debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-reporting-exec.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
