Accepting request 1113870 from Java:packages

3.2.1

OBS-URL: https://build.opensuse.org/request/show/1113870
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-dependency-tree?expand=0&rev=6

maven-dependency-tree-3.0.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42375ab1d3064a95783a1046637f03274971cc63f08341e5085a56b63bd5ae57
-size 83194

maven-dependency-tree-build.xml

@@ -10,11 +10,12 @@
 
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="maven-dependency-tree"/>
-  <property name="project.version" value="3.0.1"/>
+  <property name="project.version" value="3.2.1"/>
   <property name="project.name" value="Apache Maven Dependency Tree"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -63,6 +64,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -75,31 +77,25 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
+  <!-- Sisu javax.inject.Named generation target                              -->
   <!-- ====================================================================== -->
 
-  <target name="plexus"
+  <target name="sisu"
           depends="compile"
-          description="Generate Plexus component.xml">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
-          failonerror="true"
-          fork="true">
-      <!-- <jvmarg value="-verbose"/> -->
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-      <arg value="-X"/>
-      <arg value="-s"/>
-      <arg value="${build.srcDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.outputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </java>
+          description="Generate javax.inject.Name index">
+    <sequential>
+	  <java classname="org.eclipse.sisu.space.SisuIndex"
+	        failonerror="true"
+			fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+	</sequential>
   </target>
 
   <!-- ====================================================================== -->
@@ -107,7 +103,7 @@
   <!-- ====================================================================== -->
 
   <target name="compile-tests"
-          depends="plexus"
+          depends="sisu"
           description="Compile the test code"
           unless="test.skip">
     <mkdir dir="${build.testOutputDir}"/>
@@ -230,7 +226,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="plexus,test" description="Package the application">
+  <target name="package" depends="sisu,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"

maven-dependency-tree.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Wed Sep 27 11:15:21 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Update to version 3.2.1
+  * Bug
+    + MSHARED-994:  DependencyCollectorBuilder does not collect
+      dependencies when artifact has 'war' packaging
+    + MSHARED-1016:  Transitive provided dependencies are not
+      removed from collected dependency graph
+  * New Feature
+    + MSHARED-1158:  DependencyCollectorBuilder more configurable
+  * Improvement
+    + MSHARED-339:  DependencyGraphBuilder does not provide verbose
+      tree
+    + MSHARED-491:  DependencyGraphBuilders shouldn't need
+      reactorProjects for resolving dependencies
+    + MSHARED-519:  Maven31DependencyGraphBuilder (and others?)
+      should not download dependencies other than the pom
+    + MSHARED-657:  plexus-component-annotation in line with
+      plexus-component-metadata
+    + MSHARED-691:  Upgrade parent to 31
+    + MSHARED-788:  Add functionality to collect raw dependencies
+      in Maven 3+
+    + MSHARED-816:  Annotate DependencyNodes with dependency
+      management metadata
+    + MSHARED-825:  Require Java 8
+    + MSHARED-850:  Upgrade org.eclipse.aether:aether-util
+      dependency in org.apache.maven.shared:maven-dependency-tree
+    + MSHARED-852:  Add Exclusions to DependencyNode
+    + MSHARED-853:  make build Reproducible
+    + MSHARED-1070:  Migrate plexus component to JSR-330
+    + MSHARED-1071:  Drop maven 3.0 compatibility
+  * Dependency upgrade
+    + MSHARED-771:  Upgrade shared-component to version 33
+    + MSHARED-1069:  Upgrade Parent to 36
+    + MSHARED-1114:  Bump maven-shared-components from 36 to 37
+
 -------------------------------------------------------------------
 Wed Sep  6 18:48:23 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-dependency-tree.spec

@@ -17,7 +17,7 @@
 
 
 Name:           maven-dependency-tree
-Version:        3.0.1
+Version:        3.2.1
 Release:        0
 Summary:        Maven dependency tree artifact
 License:        Apache-2.0
@@ -26,27 +26,14 @@ URL:            https://maven.apache.org/
 Source0:        https://archive.apache.org/dist/maven/shared/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
 BuildRequires:  ant
-BuildRequires:  apache-commons-cli
 BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  jdom2
 BuildRequires:  maven-lib
 BuildRequires:  maven-resolver-api
 BuildRequires:  maven-resolver-util
-BuildRequires:  objectweb-asm
-BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-cli
-BuildRequires:  plexus-containers-component-annotations
-BuildRequires:  plexus-metadata-generator
-BuildRequires:  plexus-utils
-BuildRequires:  qdox
 BuildRequires:  sisu-inject
-BuildRequires:  sisu-plexus
 BuildRequires:  unzip
-BuildRequires:  xbean
 BuildArch:      noarch
 
 %description
@@ -63,30 +50,17 @@ This package contains javadoc for %{name}.
 %setup -q
 cp %{SOURCE1} build.xml
 
-find -name Maven3DependencyGraphBuilder.java -delete
-%pom_remove_dep org.sonatype.aether:
-
 %build
 mkdir -p lib
 build-jar-repository -s lib \
   atinject \
-  commons-cli \
-  guice/google-guice-no_aop \
-  guava/guava \
-  jdom2/jdom2 \
   maven/maven-artifact \
   maven/maven-core \
+  maven/maven-model \
   maven-resolver/maven-resolver-api \
   maven-resolver/maven-resolver-util \
-  objectweb-asm/asm org.eclipse.sisu.inject \
-  org.eclipse.sisu.plexus \
-  plexus-classworlds \
-  plexus/cli \
-  plexus-containers/plexus-component-annotations \
-  plexus-metadata-generator \
-  plexus/utils \
-  qdox \
-  xbean/xbean-reflect
+  org.eclipse.sisu.inject \
+  slf4j/api
 
 %{ant} \
   -Dtest.skip=true \