Hello community,
here is the log from the commit of package plexus-containers for
openSUSE:Factory checked in at 2019-11-26 17:00:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plexus-containers (Old)
and /work/SRC/openSUSE:Factory/.plexus-containers.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plexus-containers"
Tue Nov 26 17:00:36 2019 rev:6 rq:750672 version:2.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/plexus-containers/plexus-component-metadata.changes
2019-04-12 09:17:31.201781983 +0200
+++
/work/SRC/openSUSE:Factory/.plexus-containers.new.26869/plexus-component-metadata.changes
2019-11-26 17:00:53.824077408 +0100
@@ -1,0 +2,13 @@
+Sun Nov 24 14:53:52 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 2.1.0
+- Removed patch:
+ * 0001-Port-to-current-qdox.patch
+ + integrated upstream
+- Added patch:
+ * plexus-containers-asm6.patch
+ + allow building against asm6
+- Specify maven.compiler.release to fix build with jdk9+ and newer
+ maven-javadoc-plugin
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/plexus-containers/plexus-containers.changes
2019-04-11 12:19:48.541005864 +0200
+++
/work/SRC/openSUSE:Factory/.plexus-containers.new.26869/plexus-containers.changes
2019-11-26 17:00:53.912077379 +0100
@@ -1,0 +2,10 @@
+Sun Nov 24 14:46:44 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 2.1.0
+ * Does not build plexus-component-javadoc any more
+- Removed patch:
+ * 0001-Port-to-current-qdox.patch
+ + integrated upstream
+- Do not force building with java < 9 any more
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/plexus-containers/plexus-metadata-generator.changes
2019-04-11 12:19:49.141006121 +0200
+++
/work/SRC/openSUSE:Factory/.plexus-containers.new.26869/plexus-metadata-generator.changes
2019-11-26 17:00:54.148077302 +0100
@@ -1,0 +2,14 @@
+Sun Nov 24 14:50:30 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 2.1.0
+- Removed patch:
+ * 0001-Port-to-current-qdox.patch
+ + integrated upstream
+- Added patches:
+ * plexus-containers-asm6.patch
+ + allow building against asm6
+ * plexus-metadata-generator-cli.patch
+ + bring back the PlexusMetadataGeneratorCli.java removed by
+ upstream, but which we use heavily
+
+-------------------------------------------------------------------
Old:
----
0001-Port-to-current-qdox.patch
plexus-containers-1.7.1.tar.gz
New:
----
plexus-containers-2.1.0.tar.gz
plexus-containers-asm6.patch
plexus-metadata-generator-cli.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plexus-component-metadata.spec ++++++
--- /var/tmp/diff_new_pack.vgNato/_old 2019-11-26 17:00:55.600076822 +0100
+++ /var/tmp/diff_new_pack.vgNato/_new 2019-11-26 17:00:55.604076821 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package plexus
+# spec file for package plexus-component-metadata
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%global comp_name plexus-component-metadata
%bcond_with tests
Name: %{comp_name}
-Version: 1.7.1
+Version: 2.1.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@@ -33,24 +33,21 @@
Source0:
https://github.com/codehaus-plexus/%{base_name}/archive/%{base_name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
-Patch0: 0001-Port-to-current-qdox.patch
+Patch0: plexus-containers-asm6.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(com.thoughtworks.qdox:qdox)
-BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-model)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
-BuildRequires: mvn(org.apache.maven:maven-project)
-BuildRequires: mvn(org.codehaus.plexus:plexus-cli)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
BuildRequires: mvn(org.jdom:jdom2)
-BuildRequires: mvn(org.ow2.asm:asm-all)
+BuildRequires: mvn(org.ow2.asm:asm)
#!BuildRequires: maven-compiler-plugin-bootstrap
#!BuildRequires: maven-jar-plugin-bootstrap
#!BuildRequires: maven-javadoc-plugin-bootstrap
@@ -95,9 +92,6 @@
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@@ -120,17 +114,18 @@
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version>
%{javadoc_plugin_version}</version>|"
plexus-component-javadoc/src/it/basic/pom.xml
-
%build
pushd %{comp_name}
%{mvn_file} :%{comp_name} %{base_name}/%{comp_name}
-%if %{with tests}
- %{mvn_build}
-%else
- %{mvn_build} -f
+%{mvn_build} \
+%if %{without tests}
+ -f \
%endif
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+ -- -Dmaven.compiler.release=6
+%endif
+
+# empty line, keep
popd
%install
++++++ plexus-containers.spec ++++++
--- /var/tmp/diff_new_pack.vgNato/_old 2019-11-26 17:00:55.624076814 +0100
+++ /var/tmp/diff_new_pack.vgNato/_new 2019-11-26 17:00:55.628076813 +0100
@@ -1,7 +1,7 @@
#
# spec file for package plexus-containers
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%bcond_with tests
Name: plexus-containers
-Version: 1.7.1
+Version: 2.1.0
Release: 0
Summary: Containers for Plexus
# Most of the files are either under ASL 2.0 or MIT
@@ -32,16 +32,14 @@
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{name}-build.tar.xz
-Patch0: 0001-Port-to-current-qdox.patch
BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: guava20
+BuildRequires: guava
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: plexus-classworlds
BuildRequires: plexus-utils
BuildRequires: xbean
-BuildConflicts: java-devel >= 9
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@@ -55,14 +53,6 @@
form processing, jndi, i18n, velocity, etc. Plexus also includes an
application server which is like a J2EE application server.
-%package component-javadoc
-Summary: Javadoc component from %{name}
-Group: Development/Libraries/Java
-Requires: mvn(com.sun:tools)
-
-%description component-javadoc
-%{summary}.
-
%package component-annotations
Summary: Component API from %{name}
Group: Development/Libraries/Java
@@ -73,7 +63,7 @@
%package container-default
Summary: Default Container from %{name}
Group: Development/Libraries/Java
-Requires: mvn(com.google.guava:guava:20.0)
+Requires: mvn(com.google.guava:guava)
Requires: mvn(org.apache.xbean:xbean-reflect)
Requires: mvn(org.codehaus.plexus:plexus-classworlds)
Requires: mvn(org.codehaus.plexus:plexus-utils)
@@ -94,13 +84,11 @@
%setup -q -n %{name}-%{name}-%{version} -a100
mkdir -p lib
-build-jar-repository -s lib plexus/classworlds plexus/utils guava20/guava-20.0
junit xbean/xbean-reflect
+build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit
xbean/xbean-reflect
%if %{with tests}
build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons
hamcrest/core
%endif
-%patch0 -p1
-
cp %{SOURCE1} .
cp %{SOURCE2} .
@@ -117,9 +105,6 @@
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@@ -142,11 +127,8 @@
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version>
%{javadoc_plugin_version}</version>|"
plexus-component-javadoc/src/it/basic/pom.xml
-
%build
-for i in plexus-component-annotations plexus-component-javadoc
plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
pushd ${i}
%pom_remove_parent .
%pom_xpath_inject "pom:project"
"<groupId>org.codehaus.plexus</groupId><version>%{version}</version>" .
@@ -161,7 +143,7 @@
%install
# jars
install -dm 0755 %{buildroot}%{_javadir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc
plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/target/${i}-%{version}.jar
%{buildroot}%{_javadir}/%{name}/${i}.jar
done
install -dm 0755 %{buildroot}%{_javadir}/plexus
@@ -170,16 +152,15 @@
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc
plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
done
%add_maven_depmap %{name}/plexus-component-annotations.pom
%{name}/plexus-component-annotations.jar -f component-annotations
-%add_maven_depmap %{name}/plexus-component-javadoc.pom
%{name}/plexus-component-javadoc.jar -f component-javadoc
%add_maven_depmap %{name}/plexus-container-default.pom
%{name}/plexus-container-default.jar -f container-default -a
org.codehaus.plexus:containers-component-api
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in plexus-component-annotations plexus-component-javadoc
plexus-container-default; do
+for i in plexus-component-annotations plexus-container-default; do
cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
done
%fdupes -s %{buildroot}%{_javadocdir}
@@ -191,9 +172,6 @@
%files container-default -f .mfiles-container-default
%license LICENSE-2.0.txt LICENSE.MIT
-%files component-javadoc -f .mfiles-component-javadoc
-%license LICENSE-2.0.txt LICENSE.MIT
-
%files javadoc
%license LICENSE-2.0.txt LICENSE.MIT
%{_javadocdir}/%{name}
++++++ plexus-metadata-generator.spec ++++++
--- /var/tmp/diff_new_pack.vgNato/_old 2019-11-26 17:00:55.656076804 +0100
+++ /var/tmp/diff_new_pack.vgNato/_new 2019-11-26 17:00:55.656076804 +0100
@@ -1,7 +1,7 @@
#
# spec file for package plexus-metadata-generator
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%global comp_name component-metadata
%bcond_with tests
Name: plexus-metadata-generator
-Version: 1.7.1
+Version: 2.1.0
Release: 0
Summary: Component metadata from %{base_name}
# Most of the files are either under ASL 2.0 or MIT
@@ -34,7 +34,8 @@
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Source2: LICENSE.MIT
Source100: %{base_name}-build.tar.xz
-Patch0: 0001-Port-to-current-qdox.patch
+Patch0: plexus-containers-asm6.patch
+Patch1: plexus-metadata-generator-cli.patch
Patch1000: %{name}-nomojo.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
@@ -50,9 +51,8 @@
BuildRequires: plexus-utils
BuildRequires: qdox >= 2
BuildRequires: xbean
-BuildConflicts: java-devel >= 9
Requires: apache-commons-cli
-Requires: guava20
+Requires: guava
Requires: jdom2
Requires: objectweb-asm
Requires: plexus-cli
@@ -90,6 +90,7 @@
%endif
%patch0 -p1
+%patch1 -p1
%patch1000 -p1
@@ -109,9 +110,6 @@
%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-%pom_remove_dep com.sun:tools plexus-component-javadoc
-%pom_add_dep com.sun:tools plexus-component-javadoc
-
# Generate OSGI info
%pom_xpath_inject "pom:project" "
<packaging>bundle</packaging>
@@ -134,17 +132,12 @@
# to prevent ant from failing
mkdir -p plexus-component-annotations/src/test/java
-# integration tests fix
-sed -i "s|<version>2.3</version>|<version>
%{javadoc_plugin_version}</version>|"
plexus-component-javadoc/src/it/basic/pom.xml
-
rm -rf plexus-%{comp_name}/src/main/java/org/codehaus/plexus/maven
rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven
%pom_remove_dep :maven-core plexus-%{comp_name}
%pom_remove_dep :maven-model plexus-%{comp_name}
%pom_remove_dep :maven-plugin-api plexus-%{comp_name}
-%pom_remove_dep :maven-project plexus-%{comp_name}
-%pom_remove_dep :maven-plugin-annotations plexus-%{comp_name}
%pom_remove_parent plexus-%{comp_name}
%pom_xpath_inject "pom:project" "
@@ -176,7 +169,7 @@
cp -pr plexus-%{comp_name}/target/site/apidocs/*
%{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
# script
-%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" ""
%{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava20/guava-20.0:xbean/xbean-reflect
%{name}
+%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" ""
%{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect
%{name}
%files -f .mfiles
%license LICENSE-2.0.txt LICENSE.MIT
++++++ plexus-containers-1.7.1.tar.gz -> plexus-containers-2.1.0.tar.gz ++++++
++++ 5899 lines of diff (skipped)
++++++ plexus-containers-asm6.patch ++++++
diff -urEbwB
plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
---
plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
2019-10-23 12:28:46.000000000 +0200
+++
plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ann/AnnReader.java
2019-11-22 03:26:41.546581926 +0100
@@ -35,7 +35,7 @@
private final AnnClass annClass;
private AnnReader(AnnClass annClass) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.annClass = annClass;
}
@@ -64,7 +64,7 @@
public FieldVisitor visitField(int access, final String name, final String
desc, String signature, Object value) {
final AnnField field = new AnnField(annClass, access, name, desc);
annClass.addField(field);
- return new FieldVisitor(Opcodes.ASM7) {
+ return new FieldVisitor(Opcodes.ASM6) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -79,7 +79,7 @@
final AnnMethod method = new AnnMethod(annClass, access, mname, mdesc);
annClass.addMethod(method);
- return new MethodVisitor(Opcodes.ASM7) {
+ return new MethodVisitor(Opcodes.ASM6) {
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
Ann ann = new Ann(desc);
@@ -99,7 +99,7 @@
private Ann ann;
public AnnAnnReader(Ann ann) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.ann = ann;
}
@@ -132,7 +132,7 @@
private ArrayList<String> array = new ArrayList<String>();
public AnnAnnArrayReader(Ann ann, String name) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.ann = ann;
this.name = name;
}
++++++ plexus-containers-build.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/build.xml new/build.xml
--- old/build.xml 2019-02-24 15:30:35.867290277 +0100
+++ new/build.xml 2019-11-22 03:10:57.193211125 +0100
@@ -8,7 +8,6 @@
<target name="clean" description="Clean the output directory">
<ant antfile="build.xml" dir="plexus-component-annotations"
target="clean"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc" target="clean"/>
<ant antfile="build.xml" dir="plexus-container-default" target="clean"/>
<ant antfile="build.xml" dir="plexus-component-metadata" target="clean"/>
</target>
@@ -19,7 +18,6 @@
<target name="compile" description="Compile the code">
<ant antfile="build.xml" dir="plexus-component-annotations"
target="compile"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc" target="compile"/>
<ant antfile="build.xml" dir="plexus-container-default" target="compile"/>
<ant antfile="build.xml" dir="plexus-component-metadata" target="compile"/>
</target>
@@ -30,7 +28,6 @@
<target name="compile-tests" description="Compile the test code">
<ant antfile="build.xml" dir="plexus-component-annotations"
target="compile-tests"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc"
target="compile-tests"/>
<ant antfile="build.xml" dir="plexus-container-default"
target="compile-tests"/>
<ant antfile="build.xml" dir="plexus-component-metadata"
target="compile-tests"/>
</target>
@@ -41,7 +38,6 @@
<target name="test" description="Run the test cases">
<ant antfile="build.xml" dir="plexus-component-annotations" target="test"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc" target="test"/>
<ant antfile="build.xml" dir="plexus-container-default" target="test"/>
<ant antfile="build.xml" dir="plexus-component-metadata" target="test"/>
</target>
@@ -52,7 +48,6 @@
<target name="javadoc" description="Generates the Javadoc of the
application">
<ant antfile="build.xml" dir="plexus-component-annotations"
target="javadoc"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc" target="javadoc"/>
<ant antfile="build.xml" dir="plexus-container-default" target="javadoc"/>
<ant antfile="build.xml" dir="plexux-componant-metadata" target="javadoc"/>
</target>
@@ -63,7 +58,6 @@
<target name="package" description="Package the application">
<ant antfile="build.xml" dir="plexus-component-annotations"
target="package"/>
- <ant antfile="build.xml" dir="plexus-component-javadoc" target="package"/>
<ant antfile="build.xml" dir="plexus-container-default" target="package"/>
<ant antfile="build.xml" dir="plexus-component-metadata" target="package"/>
</target>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/common.xml new/common.xml
--- old/common.xml 2019-02-24 14:36:01.186907157 +0100
+++ new/common.xml 2019-11-22 03:10:29.481052996 +0100
@@ -3,7 +3,7 @@
<project name="common">
<property name="project.groupId" value="org.codehaus.plexus"/>
- <property name="project.version" value="1.7.1"/>
+ <property name="project.version" value="2.1.0"/>
<property name="project.organization.name" value="Codehaus Plexus"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/plexus-component-javadoc/build.xml
new/plexus-component-javadoc/build.xml
--- old/plexus-component-javadoc/build.xml 2019-02-24 16:56:47.937059705
+0100
+++ new/plexus-component-javadoc/build.xml 1970-01-01 01:00:00.000000000
+0100
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="plexus-component-javadoc" default="package" basedir=".">
-
- <!-- ======================================================================
-->
- <!-- Build environment properties
-->
- <!-- ======================================================================
-->
-
- <include file="../common.xml"/>
- <property file="build.properties"/>
-
- <property name="project.artifactId" value="plexus-component-javadoc"/>
-
- <property name="build.finalName"
value="${project.artifactId}-${project.version}"/>
- <property name="build.dir" value="target"/>
- <property name="build.outputDir" value="${build.dir}/classes"/>
- <property name="build.srcDir.0" value="src/main/java"/>
- <property name="build.resourceDir.0" value="src/main/resources"/>
- <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
- <property name="build.testDir.0" value="src/test/java"/>
- <property name="build.testResourceDir.0" value="src/test/resources"/>
- <property name="test.reports" value="${build.dir}/test-reports"/>
- <property name="reporting.outputDirectory" value="${build.dir}/site"/>
-
- <!-- ======================================================================
-->
- <!-- Defining classpaths
-->
- <!-- ======================================================================
-->
-
- <path id="build.classpath"/>
- <path id="build.test.classpath">
- <fileset dir="../lib">
- <!-- junit-4.12 hamcrest-core-1.3 -->
- <include name="**/*"/>
- </fileset>
- </path>
-
- <!-- ======================================================================
-->
- <!-- Cleaning up target
-->
- <!-- ======================================================================
-->
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${build.dir}"/>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Compilation target
-->
- <!-- ======================================================================
-->
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${build.outputDir}"/>
- <javac destdir="${build.outputDir}"
- nowarn="false"
- debug="true"
- optimize="false"
- deprecation="true"
- target="${compiler.target}"
- verbose="false"
- fork="false"
- source="${compiler.source}">
- <src>
- <pathelement location="${build.srcDir.0}"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Test-compilation target
-->
- <!-- ======================================================================
-->
-
- <target name="compile-tests"
- depends="compile"
- description="Compile the test code"
- unless="test.skip">
- <mkdir dir="${build.testOutputDir}"/>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Run all tests
-->
- <!-- ======================================================================
-->
-
- <target name="test"
- depends="compile-tests, junit-missing"
- unless="junit.skipped"
- description="Run the test cases"/>
-
- <target name="test-junit-present">
- <available classname="junit.framework.Test" property="junit.present"
classpathref="build.test.classpath"/>
- </target>
-
- <target name="test-junit-status"
- depends="test-junit-present">
- <condition property="junit.missing">
- <and>
- <isfalse value="${junit.present}"/>
- <isfalse value="${test.skip}"/>
- </and>
- </condition>
- <condition property="junit.skipped">
- <or>
- <isfalse value="${junit.present}"/>
- <istrue value="${test.skip}"/>
- </or>
- </condition>
- </target>
-
- <target name="junit-missing"
- depends="test-junit-status"
- if="junit.missing">
- <echo>=================================== WARNING
===================================</echo>
- <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib
directory. Tests not executed.</echo>
-
<echo>===============================================================================</echo>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Javadoc target
-->
- <!-- ======================================================================
-->
-
- <target name="javadoc" description="Generates the Javadoc of the
application">
- <javadoc sourcepath="${build.srcDir.0}"
- packagenames="*"
- destdir="${reporting.outputDirectory}/apidocs"
- access="protected"
- classpathref="build.classpath"
- verbose="false"
- version="true"
- use="true"
- author="true"
- splitindex="false"
- nodeprecated="false"
- nodeprecatedlist="false"
- notree="false"
- noindex="false"
- nohelp="false"
- nonavbar="false"
- serialwarn="false"
- charset="ISO-8859-1"
- linksource="false"
- breakiterator="false"/>
- </target>
-
- <!-- ======================================================================
-->
- <!-- Package target
-->
- <!-- ======================================================================
-->
-
- <target name="package" depends="compile,test" description="Package the
application">
- <jar jarfile="${build.dir}/${build.finalName}.jar"
- compress="true"
- index="false"
- basedir="${build.outputDir}"
- excludes="**/package.html">
- <manifest>
- <attribute name="JavaPackages-ArtifactId"
value="${project.artifactId}"/>
- <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
- <attribute name="JavaPackages-Version" value="${project.version}"/>
- </manifest>
- </jar>
- </target>
-
- <!-- ======================================================================
-->
- <!-- A dummy target for the package named after the type it creates
-->
- <!-- ======================================================================
-->
-
- <target name="jar" depends="package" description="Builds the jar for the
application"/>
-
-</project>
++++++ plexus-metadata-generator-cli.patch ++++++
diff -urEbwBN
plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
---
plexus-containers-plexus-containers-2.1.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
1970-01-01 01:00:00.000000000 +0100
+++
plexus-containers-plexus-containers-2.1.0.new/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/PlexusMetadataGeneratorCli.java
2019-11-22 04:47:34.934070355 +0100
@@ -0,0 +1,62 @@
+package org.codehaus.plexus.metadata;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.tools.cli.AbstractCli;
+
+public class PlexusMetadataGeneratorCli
+ extends AbstractCli
+{
+ public static final char SOURCE_DIRECTORY = 's';
+ public static final char SOURCE_ENCODING = 'e';
+ public static final char CLASSES_DIRECTORY = 'c';
+ public static final char OUTPUT_FILE = 'o';
+ public static final char DESCRIPTORS_DIRECTORY = 'm';
+
+ public static void main( String[] args )
+ throws Exception
+ {
+ new PlexusMetadataGeneratorCli().execute( args );
+ }
+
+ @Override
+ public String getPomPropertiesPath()
+ {
+ return
"META-INF/maven/org.codehaus.plexus/plexus-metadata-generator/pom.properties";
+ }
+
+ @Override
+ @SuppressWarnings("static-access")
+ public Options buildCliOptions( Options options )
+ {
+ options.addOption( OptionBuilder.withLongOpt( "source"
).hasArg().withDescription( "Source directory." ).create( SOURCE_DIRECTORY ) );
+ options.addOption( OptionBuilder.withLongOpt( "encoding"
).hasArg().withDescription( "Source file encoding." ).create( SOURCE_ENCODING )
);
+ options.addOption( OptionBuilder.withLongOpt( "classes"
).hasArg().withDescription( "Classes directory." ).create( CLASSES_DIRECTORY )
);
+ options.addOption( OptionBuilder.withLongOpt( "output"
).hasArg().withDescription( "Output directory." ).create( OUTPUT_FILE ) );
+ options.addOption( OptionBuilder.withLongOpt( "descriptors"
).hasArg().withDescription( "Descriptors directory." ).create(
DESCRIPTORS_DIRECTORY ) );
+ return options;
+ }
+
+ public void invokePlexusComponent( CommandLine cli, PlexusContainer plexus
)
+ throws Exception
+ {
+ MetadataGenerator metadataGenerator = plexus.lookup(
MetadataGenerator.class );
+
+ MetadataGenerationRequest request = new MetadataGenerationRequest();
+ request.classesDirectory = new File( cli.getOptionValue(
CLASSES_DIRECTORY ) );
+ request.classpath = Collections.emptyList();
+ request.sourceDirectories = Arrays.asList( new String[]{ new File(
cli.getOptionValue( SOURCE_DIRECTORY ) ).getAbsolutePath() } );
+ request.sourceEncoding = cli.getOptionValue( SOURCE_ENCODING );
+ request.useContextClassLoader = true;
+ request.outputFile = new File( cli.getOptionValue( OUTPUT_FILE ) );
+ request.componentDescriptorDirectory = new File( cli.getOptionValue(
DESCRIPTORS_DIRECTORY ) );
+
+ metadataGenerator.generateDescriptor( request );
+ }
+}
