whitespace

maven-verifier-1.6-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a7eab364d939196994ae70cdf1e92d8c99222fac8791c15602a73bab98d85a0
-size 39122

maven-verifier-build.xml

@@ -10,7 +10,6 @@
 
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="maven-verifier"/>
-  <property name="project.version" value="1.6"/>
   <property name="project.name" value="Apache Maven Verifier Component"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 

maven-verifier.changes

@@ -1,3 +1,37 @@
+-------------------------------------------------------------------
+Tue Apr  2 10:43:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 2.0.0 milestone 1
+  * Breaking changes
+    + MSHARED-1137 - get default Maven home only from maven.home
+      system property
+    + MSHARED-1125 - Require Maven args to be provided one by one
+    + MSHARED-1127 - Remove main method from Verifier
+    + MSHARED-690 - Change package from org.apache.maven.it to
+      o.a.m.shared.verifier
+  * Deprecated
+    + MSHARED-1134 - Deprecate internal Verifier debug mode
+    + MSHARED-1135 - deprecate mavenDebug option
+    + MSHARED-1128 - Introduce execute method and deprecate
+      executeGoal(s)
+    + MSHARED-1129 - Prepare for replace CLI options with CLI args
+  * New features and improvements
+    + Code cleanup
+    + MSHARED-1142 - remove rendundant error message
+    + MSHARED-1124 - Add new version of methods filterFile and
+      newDefaultFilterMap
+    + MSHARED-1089 - Upgrade maven-verifier to JDK 8 / Junit 5
+  * Bug Fixes
+    + Fix inverted test
+  * Dependency updates
+    + Bump junit-jupiter from 5.9.0 to 5.9.1
+    + Bump maven-shared-components from 36 to 37
+    + Bump junit-jupiter from 5.8.0 to 5.9.0
+    + Bump maven-shared-utils from 0.1 to 3.3.3 in /src/test/resources
+    + MSHARED-1075 - Upgrade Parent to 36
+  * Documentation updates
+    + MSHARED-1128 - Update documentation with new execute method
+
 -------------------------------------------------------------------
 Wed Sep  6 18:27:57 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-verifier.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-verifier
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,17 @@
 #
 
 
+%global upstream_version 2.0.0
+%global upstream_milestone M1
+%global maven_version %{upstream_version}%{?upstream_milestone:-%{upstream_milestone}}
 Name:           maven-verifier
-Version:        1.6
+Version:        %{upstream_version}%{?upstream_milestone:~%{upstream_milestone}}
 Release:        0
 Summary:        Test harness for Maven integration tests
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/shared/maven-verifier
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{maven_version}/%{name}-%{maven_version}-source-release.zip
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
@@ -44,7 +47,7 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{maven_version}
 cp %{SOURCE1} build.xml
 
 %build
@@ -54,12 +57,13 @@ build-jar-repository -s lib \
   junit
 
 %{ant} \
-  jar javadoc
+    -Dproject.version=%{maven_version} \
+    jar javadoc
 
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
-install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+install -pm 0644 target/%{name}-%{maven_version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom