[jsoup] Initial import (#725504).
by Jaromír Cápík
commit 621f71afff62cccd0f777e72d326bb9d2d23dbbc
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Tue Jul 26 15:38:15 2011 +0200
Initial import (#725504).
.gitignore | 1 +
jsoup.spec | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 94 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c3af04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jsoup-1.6.1.tar.xz
diff --git a/jsoup.spec b/jsoup.spec
new file mode 100644
index 0000000..7e2887c
--- /dev/null
+++ b/jsoup.spec
@@ -0,0 +1,92 @@
+Name: jsoup
+Version: 1.6.1
+Release: 2%{?dist}
+Summary: Java library for working with real-world HTML
+
+Group: Development/Libraries
+License: MIT
+
+URL: http://%{name}.org/
+
+# git clone git://github.com/jhy/jsoup
+# git archive --prefix="jsoup-1.6.1/" --format=tar jsoup-1.6.1 | xz > jsoup-1.6.1.tar.xz
+Source0: %{name}-%{version}.tar.xz
+
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-surefire-provider-junit4
+Requires: maven
+Requires: jpackage-utils
+Requires: java
+
+
+%description
+jsoup is a Java library for working with real-world HTML.
+It provides a very convenient API for extracting and manipulating data,
+using the best of DOM, CSS, and jquery-like methods.
+
+jsoup implements the WHATWG HTML5 specification,
+and parses HTML to the same DOM as modern browsers do.
+
+ - scrape and parse HTML from a URL, file, or string
+ - find and extract data, using DOM traversal or CSS selectors
+ - manipulate the HTML elements, attributes, and text
+ - clean user-submitted content against a safe white-list,
+ to prevent XSS attacks
+ - output tidy HTML
+
+jsoup is designed to deal with all varieties of HTML found in the wild;
+from pristine and validating, to invalid tag-soup;
+jsoup will create a sensible parse tree.
+
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+API documentation for %{name}.
+
+%prep
+%setup -q
+
+%build
+mvn-rpmbuild install javadoc:aggregate
+
+%install
+# jars
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# poms
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# javadoc
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%doc LICENSE README CHANGES
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files javadoc
+%doc LICENSE
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Fri Jul 22 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.6.1-2
+- Switching to sources from github
+
+* Fri Jul 22 2011 Jaromir Capik <jcapik(a)redhat.com> - 1.6.1-1
+- Initial package
diff --git a/sources b/sources
index e69de29..04088c5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0e3a0bbf7a810fad91fb561846e27792 jsoup-1.6.1.tar.xz
12 years, 10 months
[maven-release] Import patch provided by Jarom��r C��p��k (#725088)
by Guido Grazioli
commit 0100f268ee51d11768adf6a17fa751613444a814
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Tue Jul 26 16:34:26 2011 +0200
Import patch provided by Jaromír Cápík (#725088)
.gitignore | 1 +
001-mavenrelease-skiptests.patch | 42 ++++++++++++++++
001_mavenreleasemanager_fixbuild.patch | 35 -------------
002-mavenrelease-fixbuild.patch | 54 +++++++++++++++++++++
002_mavenreleaseplugin_skiptests.patch | 14 -----
maven-release-jpp-depmap.xml | 14 -----
maven-release.spec | 83 +++++++++++---------------------
sources | 2 +-
8 files changed, 127 insertions(+), 118 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91d8947..fe9925c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-release-2.0.tar.xz
/maven-release-2.0.tar.xz
+/maven-release-2.2.tar.xz
diff --git a/001-mavenrelease-skiptests.patch b/001-mavenrelease-skiptests.patch
new file mode 100644
index 0000000..54f80f1
--- /dev/null
+++ b/001-mavenrelease-skiptests.patch
@@ -0,0 +1,42 @@
+diff -u -r maven-release-2.2/maven-release-manager/pom.xml maven-release-2.2-patched/maven-release-manager/pom.xml
+--- maven-release-2.2/maven-release-manager/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-manager/pom.xml 2011-07-18 18:01:32.961894470 +0200
+@@ -197,23 +197,6 @@
+ <version>${scmVersion}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock-cglib</artifactId>
+- <version>1.0.1</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+- <groupId>org.mockito</groupId>
+- <artifactId>mockito-all</artifactId>
+- <version>1.8.5</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
+diff -u -r maven-release-2.2/maven-release-plugin/pom.xml maven-release-2.2-patched/maven-release-plugin/pom.xml
+--- maven-release-2.2/maven-release-plugin/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-plugin/pom.xml 2011-07-18 18:01:53.953909509 +0200
+@@ -95,11 +95,6 @@
+ <artifactId>jdom</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>jmock</groupId>
+- <artifactId>jmock</artifactId>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
diff --git a/002-mavenrelease-fixbuild.patch b/002-mavenrelease-fixbuild.patch
new file mode 100644
index 0000000..5011340
--- /dev/null
+++ b/002-mavenrelease-fixbuild.patch
@@ -0,0 +1,54 @@
+--- maven-release-2.2/maven-release-manager/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-manager/pom.xml 2011-07-26 16:06:54.854973698 +0200
+@@ -80,6 +80,12 @@
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+@@ -254,13 +243,13 @@
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ <execution>
+@@ -274,7 +263,7 @@
+ </configuration>
+ <phase>process-resources</phase>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>merge-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+--- maven-release-2.2/maven-release-plugin/pom.xml 2011-06-27 10:45:56.000000000 +0200
++++ maven-release-2.2-patched/maven-release-plugin/pom.xml 2011-07-26 16:03:02.203751549 +0200
+@@ -53,6 +53,11 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-release.spec b/maven-release.spec
index f07dd39..1d83532 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,35 +1,25 @@
-# maven-release parent pom version
-%global pversion 16
-# maven-release-manager jar version
-%global mjarver 2.0
-# maven-release-plugin jar version
-%global pjarver 2.0
-
Name: maven-release
-Version: 2.0
-Release: 3%{?dist}
+Version: 2.2
+Release: 2%{?dist}
Summary: Release a project updating the POM and tagging in the SCM
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-release-plugin/
# tar creation instructions
-# svn export http://svn.apache.org/repos/asf//maven/release/tags/maven-release-2.0 maven-release-2.0
-# tar cfJ maven-release-2.0.tar.xz maven-release-2.0
-Source0: maven-release-2.0.tar.xz
-Source1: maven-release-jpp-depmap.xml
+# svn export http://svn.apache.org/repos/asf/maven/release/tags/maven-release-2.2 maven-release-2.2
+# tar cfJ maven-release-2.2.tar.xz maven-release-2.2
+Source0: maven-release-2.2.tar.xz
# Remove jmock needed for tests and set source to 1.4 to support assert stmt
-Patch0: 001_mavenreleasemanager_fixbuild.patch
+Patch0: 001-mavenrelease-skiptests.patch
# Remove deps needed for tests, till jmock gets packaged
-Patch1: 002_mavenreleaseplugin_skiptests.patch
+Patch1: 002-mavenrelease-fixbuild.patch
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
+BuildRequires: maven
BuildRequires: maven-scm >= 1.4-1
-BuildRequires: maven-scm-test >= 1.4-1
-BuildRequires: maven2
-BuildRequires: maven2-common-poms >= 0:1.0-13
BuildRequires: maven-antrun-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
@@ -40,7 +30,7 @@ BuildRequires: maven-plugin-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-plugin-testing-harness
-BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-metadata
BuildRequires: plexus-utils
BuildRequires: maven-surefire-maven-plugin
BuildRequires: jaxen
@@ -109,46 +99,32 @@ EOT
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- -Dmaven.test.skip=true \
- install javadoc:aggregate
+mvn-rpmbuild -e -Dmaven.test.skip=true install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-
# jars
-install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{mjarver}.jar \
- $RPM_BUILD_ROOT%{_javadir}//%{name}-manager.jar
-
-install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{pjarver}.jar \
+install -Dp -m 644 %{name}-manager/target/%{name}-manager-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-manager.jar
+install -Dp -m 644 %{name}-plugin/target/%{name}-plugin-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-plugin.jar
# javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/
+cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 %{name}-manager/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-manager.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-manager.pom
install -pm 644 %{name}-plugin/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-plugin.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-plugin.pom
-%add_to_maven_depmap org.apache.maven.release %{name} %{pversion} JPP %{name}
-%add_to_maven_depmap org.apache.maven.release %{name}-manager %{mjarver} JPP %{name}-manager
-%add_to_maven_depmap org.apache.maven.plugins %{name}-plugin %{pjarver} JPP %{name}-plugin
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{name}-manager.pom %{name}-manager.jar
+%add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar
%files
%defattr(-,root,root,-)
@@ -172,18 +148,17 @@ install -pm 644 %{name}-plugin/pom.xml \
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
-%post
-%update_maven_depmap
-
-
-%postun
-%update_maven_depmap
+%changelog
+* Tue Jul 26 2011 Guido Grazioli <guido.grazioli(a)gmail.com> - 2.2-2
+- Import patch provided by Jaromír Cápík (#725088)
+* Mon Jul 18 2011 Guido Grazioli <guido.grazioli(a)gmail.com> - 2.2-1
+- Update to 2.2
+- Update to current guidelines
+- Build with maven 3
-%changelog
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index d5af442..0bc1a45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75eece9079322e0c07fdc83324e335c4 maven-release-2.0.tar.xz
+1d135afb48bf3841f4ec4c9db5b57234 maven-release-2.2.tar.xz
12 years, 10 months
[maven] Add bash completion (#706856)
by Stanislav Ochotnicky
commit 3ace7c298b0bc812194c134fa05f260199b86085
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jul 26 16:08:34 2011 +0200
Add bash completion (#706856)
maven-bash-completion | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
maven.spec | 9 +++++-
2 files changed, 92 insertions(+), 1 deletions(-)
---
diff --git a/maven-bash-completion b/maven-bash-completion
new file mode 100644
index 0000000..9ef9673
--- /dev/null
+++ b/maven-bash-completion
@@ -0,0 +1,84 @@
+_m2_make_goals()
+{
+ plugin=$1
+ mojos=$2
+ for mojo in $mojos
+ do
+ export goals="$goals $plugin:$mojo"
+ done
+}
+
+_m2_complete()
+{
+ local cur goals
+
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+ case "${prev}" in
+ -f | --file|-l|--log-file)
+ COMPREPLY=( $(compgen -f ${cur}) )
+ return 0
+ ;;
+ *);;
+ esac
+
+
+ goals='clean compile test install package deploy site'
+ if [[ ${cur} == -* ]] ; then
+ goals="$goals -am --also-make
+ -amd --also-make-dependents
+ -B --batch-mode
+ -C --strict-checksums
+ -c --lax-checksums
+ -cpu --check-plugin-updates
+ -D --define
+ -e --errors
+ -emp --encrypt-master-password
+ -ep --encrypt-password
+ -f --file
+ -fae --fail-at-end
+ -ff --fail-fast
+ -fn --fail-never
+ -gs --global-settings
+ -h --help
+ -l --log-file
+ -N --non-recursive
+ -npr --no-plugin-registry
+ -npu --no-plugin-updates
+ -nsu --no-snapshot-updates
+ -o --offline
+ -P --activate-profiles
+ -pl --projects
+ -q --quiet
+ -rf --resume-from
+ -s --settings
+ -T --threads
+ -t --toolchains
+ -U --update-snapshots
+ -up --update-plugins
+ -V --show-version
+ -v --version
+ -X --debug
+ -Dmaven.repo.local=
+ -Dmaven.local.depmap.file=
+ -Dmaven.local.debug=true
+ -Dmaven.local.mode=true"
+ fi
+
+ goals=$goals _m2_make_goals "eclipse" "eclipse"
+ goals=$goals _m2_make_goals "idea" "idea"
+ goals=$goals _m2_make_goals "assembly" "assembly"
+ goals=$goals _m2_make_goals "plexus" "app bundle-application bundle-runtime descriptor runtime service"
+ goals=$goals _m2_make_goals "dependency" "analyze analyze-dep-mgt analyze-only analyze-report analyze-duplicate
+ build-classpath copy copy-dependencies get go-offline list properties
+ purge-local-repository resolve resolve-plugins sources tree unpack
+ unpack-dependencies"
+ cur=`echo $cur | sed 's/\\\\//g'`
+ COMPREPLY=($(compgen -W "${goals}" -- ${cur} | sed 's/\\\\//g') )
+}
+
+complete -F _m2_complete -o filenames mvn3
+complete -F _m2_complete -o filenames mvn-local
+complete -F _m2_complete -o filenames mvn-rpmbuild
diff --git a/maven.spec b/maven.spec
index 792e0f0..287e1d6 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
Name: maven
Version: 3.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -10,6 +10,7 @@ URL: http://maven.apache.org/
# Source URL is for testing only, final version will be in different place:
# http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
Source0: http://www.apache.org/dyn/closer.cgi/maven/source/apache-%{name}-%{versio...
+Source1: maven-bash-completion
# custom resolver java files
# source: git clone git://fedorapeople.org/~sochotni/maven-javadir-resolver/
@@ -293,6 +294,8 @@ install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-maven
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# Install bash-completion
+install -Dm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%files
%doc LICENSE.txt NOTICE.txt README.txt
@@ -316,6 +319,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%config %{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%{_datadir}/%{name}/repo-metadata.tar.xz
+%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
%files javadoc
%doc LICENSE.txt
@@ -323,6 +327,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Tue Jul 26 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-10
+- Add bash completion (#706856)
+
* Mon Jul 4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-9
- Add resolving from jnidir and java-jni
12 years, 10 months
[Bug 724018] New: [PATCH] Removal of plexus-maven-plugin dependency (not needed)
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: [PATCH] Removal of plexus-maven-plugin dependency (not needed)
https://bugzilla.redhat.com/show_bug.cgi?id=724018
Summary: [PATCH] Removal of plexus-maven-plugin dependency (not
needed)
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven-site-plugin
AssignedTo: sochotni(a)redhat.com
ReportedBy: jcapik(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 652183
Classification: Fedora
Story Points: ---
Created attachment 514253
--> https://bugzilla.redhat.com/attachment.cgi?id=514253
plexus-maven-plugin-removal.patch
Description of problem:
The attached patch removes the plexus-maven-plugin dependency. It is not needed
for the build.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 10 months