diff --git a/unit-api-1.0.tar.gz b/unit-api-1.0.tar.gz
deleted file mode 100644
index b40d306cd1d0c260265d4129e18636a61f61e6e8..0000000000000000000000000000000000000000
Binary files a/unit-api-1.0.tar.gz and /dev/null differ
diff --git a/unit-api-2.2.tar.gz b/unit-api-2.2.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..89a5e9245e0072ed360f7448705dde503abb7d1f
Binary files /dev/null and b/unit-api-2.2.tar.gz differ
diff --git a/unit-api.spec b/unit-api.spec
index 83d3e8990c3e2c693e23ab12a5b54926f2d092c4..61d014f1a3b08b31ac0e7e0086d69a035618da4a 100644
--- a/unit-api.spec
+++ b/unit-api.spec
@@ -1,12 +1,16 @@
Name: unit-api
-Version: 1.0
-Release: 6
+Version: 2.2
+Release: 1
Summary: JSR 363 - Units of Measurement API
License: BSD
URL: http://unitsofmeasurement.github.io/
Source0: https://github.com/unitsofmeasurement/unit-api/archive/%{version}/unit-api-%{version}.tar.gz
BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin) mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: mvn(tech.uom:uom-parent:pom:) mvn(org.apache.maven.plugins:maven-install-plugin) mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) mvn(javax.inject:javax.inject) mvn(org.apache.maven.surefire:surefire-junit-platform)
+BuildRequires: java-11-openjdk-devel
+Requires: java-11-openjdk
BuildArch: noarch
%description
@@ -27,16 +31,17 @@ This package contains javadoc for unit-api.
find . -name "*.class" -print -delete
find . -name "*.jar" -print -delete
+sed -i 's/jakarta.inject/javax.inject/' src/test/java/javax/measure/spi/ServiceProviderTest.java
%pom_remove_plugin :coveralls-maven-plugin
-%pom_remove_plugin :findbugs-maven-plugin
%pom_remove_plugin :formatter-maven-plugin
%pom_remove_plugin :jacoco-maven-plugin
%pom_remove_plugin :license-maven-plugin
-%pom_remove_plugin :maven-checkstyle-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-pmd-plugin
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-source-plugin
+%pom_remove_dep :jakarta.inject-api
+%pom_add_dep javax.inject:javax.inject
%pom_remove_plugin :maven-jar-plugin
%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin:'${maven.jar.version}' . "
@@ -47,44 +52,28 @@ find . -name "*.jar" -print -delete
"
-%pom_remove_plugin :maven-bundle-plugin
-%pom_add_plugin org.apache.felix:maven-bundle-plugin:'${felix.version}' . "
-true
-
-
- \${project.name}
- \${project.version}
- \${project.organization.name}
- Unit-API contributors
- \${project.organization.url}
-
-
-
-
- bundle-manifest
- process-classes
-
- manifest
-
-
-"
%mvn_file : unit-api
%mvn_file :unit-api:tests: unit-api-tests
%mvn_package :unit-api:tests: unit-api
%build
+java11_version=`rpm -qa | grep java-11-openjdk-11`
+export JAVA_HOME=/usr/lib/jvm/$java11_version
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%license LICENSE.txt
+%license LICENSE
%files help -f .mfiles-javadoc
%doc README.md
%changelog
+* Fri Aug 25 2023 wangkai <13474090681@163.com> - 2.2-1
+- Update to 2.2
+
* Wed Apr 15 2020 zhangtao - 1.0-6
- Package init