开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:glassfish-jaxb-api.spec Changed

@@ -1,14 +1,16 @@
 Name:                glassfish-jaxb-api
-Version:             2.2.12
-Release:             12
+Version:             2.3.1
+Release:             1
 Summary:             Java Architecture of XML Binding
 License:             CDDL-1.1 or GPLv2 with exceptions
 URL:                 http://jaxb.java.net/
-Source0:             https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b141001.1542/jaxb-api-%{version}-b141001.1542-sources.jar
-Source1:             https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b141001.1542/jaxb-api-%{version}-b141001.1542.pom
+Source0:             https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar
+Source1:             https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.pom
+Source2:             https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api-parent/2.3.1/jaxb-api-parent-2.3.1.pom
 
 BuildRequires:       java-javadoc maven-local mvn(net.java:jvnet-parent:pom:)
 BuildRequires:       mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:       mvn(org.apache.maven.plugins:maven-dependency-plugin)
 
 BuildArch:           noarch
 
@@ -39,11 +41,16 @@
 %pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
 %pom_remove_plugin org.glassfish.build:gfnexus-maven-plugin
 %pom_remove_plugin :findbugs-maven-plugin
-%pom_remove_plugin :maven-gpg-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-antrun-plugin
+%pom_remove_dep javax.activation:javax.activation-api
 %pom_xpath_set "pom:instructions/pom:Import-Package" "javax.activation;resolution:=optional,*"
 sed -i 's|<location>${basedir}/offline-javadoc</location>|<location>%{_javadocdir}/java</location>|' pom.xml
+cp %{SOURCE2} %{_builddir}/pom.xml
+sed -i '/<release>8/d' pom.xml
+sed -i '/<release>9/d' pom.xml
+rm -rf src/main/java/module-info.java
 
 %build
 %mvn_file :jaxb-api jaxb-api
@@ -57,6 +64,9 @@
 %files help -f .mfiles-javadoc
 
 %changelog
+* Tue Oct 24 2023 Ge Wang <wang__ge@126.com> - 2.3.1-1
+- Update to version 2.3.1
+
 * Thu Jul 7 2022 Chenyx <chenyixiong3@huawei.com> - 2.2.12-12
 - License compliance rectification

_service Changed

_service:tar_scm:jaxb-api-2.2.12-b141001.1542-sources.jar Deleted

_service:tar_scm:jaxb-api-2.3.1-sources.jar Added

_service:tar_scm:jaxb-api-2.2.12-b141001.1542.pom -> _service:tar_scm:jaxb-api-2.3.1.pom Changed

@@ -1,21 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>net.java</groupId>
-        <artifactId>jvnet-parent</artifactId>
-        <version>4</version>
+        <artifactId>jaxb-api-parent</artifactId>
+        <groupId>javax.xml.bind</groupId>
+        <version>2.3.1</version>
     </parent>
-    
     <modelVersion>4.0.0</modelVersion>
-    <groupId>javax.xml.bind</groupId>
+
     <artifactId>jaxb-api</artifactId>
-    <version>2.2.12-b141001.1542</version>
     <packaging>jar</packaging>
 
-    <name>Java Architecture for XML Binding</name>
-    <description>JAXB (JSR 222) API</description>
-    <url>http://jaxb.java.net/</url>
-
-    <organization>
-        <name>Oracle Corporation</name>
-        <url>http://www.oracle.com/</url>
-    </organization>
+    <dependencies>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+        </dependency>
+    </dependencies>
 
-    <developers>
-        <developer>
-            <name>Martin Grebac</name>
-            <email>martin.grebac@oracle.com</email>
-            <organization>Oracle Corporation</organization>
-        </developer>
-        <developer>
-            <name>Iaroslav Savytskyi</name>
-            <email>iaroslav.savytskyi@oracle.com</email>
-            <organization>Oracle Corporation</organization>
-        </developer>
-    </developers>
-    
-    <licenses>
-        <license>
-            <name>CDDL 1.1</name>
-            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
-            <distribution>repo</distribution>
-        </license>
-        <license>
-            <name>GPL2 w/ CPE</name>
-            <url>https://glassfish.java.net/public/CDDL+GPL_1_1.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:svn:http://svn.java.net/svn/jsr222~svn/branches/jaxb-2_2</connection>
-        <developerConnection>scm:svn:https://svn.java.net/svn/jsr222~svn/branches/jaxb-2_2</developerConnection>
-        <url>http://java.net/projects/jsr222/sources/svn/show/branches/jaxb-2_2</url>
-    </scm>
-    <issueManagement>
-        <system>jira</system>
-        <url>http://java.net/jira/browse/JAXB</url>
-    </issueManagement>
-
-    <properties>
-        <release.spec.feedback>spec-comments@jsr222.java.net</release.spec.feedback>
-        <release.spec.date>Dec 2009</release.spec.date>
-        <findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
-        <findbugs.threshold>Low</findbugs.threshold>
-    </properties>
-    
     <build>
 
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
                     <groupId>org.glassfish.build</groupId>
                     <artifactId>gfnexus-maven-plugin</artifactId>
-                    <version>0.18</version>
+                    <version>0.20</version>
                     <configuration>
                         <stagingRepos>
                             <stagingRepo>
@@ -135,13 +83,260 @@
                         <message>JAXB_API-${project.version}</message>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <configuration>
+                        <rules>
+                            <requireJavaVersion>
+                                <version>1.8,)</version>
+                            </requireJavaVersion>
+                            <requireMavenVersion>
+                                <version>3.0.3,)</version>
+                            </requireMavenVersion>
+                            <DependencyConvergence />
+                        </rules>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>cobertura-maven-plugin</artifactId>
+                    <version>2.7</version>
+                    <configuration>
+                        <formats>
+                            <format>xml</format>
+                        </formats>
+                        <check>
+                            <totalLineRate>45</totalLineRate>
+                            <packageLineRate>45</packageLineRate>
+                            <haltOnFailure>true</haltOnFailure>
+                        </check>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.glassfish.copyright</groupId>
+                    <artifactId>glassfish-copyright-maven-plugin</artifactId>
+                    <version>1.49</version>
+                    <configuration>
+                        <templateFile>${project.basedir}/copyright.txt</templateFile>
+                        <excludeFile>${project.basedir}/copyright-exclude</excludeFile>
+                        
+                        <scmOnly>true</scmOnly>
+                        
+                        <warn>true</warn>
+                        
+                        <update>false</update>
+                        
+                        <ignoreYear>false</ignoreYear>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.1.0</version>
+                    <configuration>
+                        <archive>
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                            <manifestEntries>
+                                <Extension-Name>javax.xml.bind</Extension-Name>
+                                <Implementation-Build-Id>${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
+                                <Multi-Release>true</Multi-Release>
+                            </manifestEntries>
+                            <manifest>

_service:tar_scm:jaxb-api-parent-2.3.1.pom Added

@@ -0,0 +1,213 @@
+<?xml version="1.0"?>
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>javax.xml.bind</groupId>
+    <artifactId>jaxb-api-parent</artifactId>
+    <version>2.3.1</version>
+
+    <parent>
+        <groupId>net.java</groupId>
+        <artifactId>jvnet-parent</artifactId>
+        <version>5</version>
+    </parent>
+
+    <modules>
+        <module>jaxb-api</module>
+        <module>jaxb-api-test</module>
+    </modules>
+    <packaging>pom</packaging>
+
+    <name>Java Architecture for XML Binding</name>
+    <description>JAXB (JSR 222) API</description>
+    <url>https://github.com/javaee/jaxb-spec</url>
+
+    <organization>
+        <name>Oracle Corporation</name>
+        <url>http://www.oracle.com/</url>
+    </organization>
+
+    <scm>
+        <connection>scm:git:git://github.com/javaee/jaxb-spec.git</connection>
+        <developerConnection>scm:git:git@github.com:javaee/jaxb-spec.git</developerConnection>
+        <url>https://github.com/javaee/jaxb-spec.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>Roman Grigoriadi</name>
+            <email>roman.grigoriadi@oracle.com</email>
+            <organization>Oracle Corporation</organization>
+        </developer>
+        <developer>
+            <name>Martin Grebac</name>
+            <email>martin.grebac@oracle.com</email>
+            <organization>Oracle Corporation</organization>
+        </developer>
+        <developer>
+            <name>Iaroslav Savytskyi</name>
+            <email>iaroslav.savytskyi@oracle.com</email>
+            <organization>Oracle Corporation</organization>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>CDDL 1.1</name>
+            <url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>GPL2 w/ CPE</name>
+            <url>https://oss.oracle.com/licenses/CDDL+GPL-1.1</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <issueManagement>
+        <system>jira</system>
+        <url>https://github.com/javaee/jaxb-spec/issues</url>
+    </issueManagement>
+
+    <properties>
+        <release.spec.feedback>javaee-spec@javaee.groups.io</release.spec.feedback>
+        <release.spec.date>Jul 2017</release.spec.date>
+        <findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
+        <findbugs.threshold>Low</findbugs.threshold>
+        <mrjar.sourceDirectory>${project.basedir}/src/main/mr-jar</mrjar.sourceDirectory>
+        <mrjar.build.outputDirectory>${project.build.directory}/classes-mrjar</mrjar.build.outputDirectory>
+        <extension.name>javax.xml.bind</extension.name>
+        <spec.version>2.3</spec.version>
+        <impl.version>0</impl.version>
+        <activation.version>1.2.0</activation.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>javax.activation-api</artifactId>
+                <version>${activation.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.7.0</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                        <compilerArgs>
+                            <arg>-Xlint:all</arg>
+                        </compilerArgs>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.20</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5.3</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.0.0-M2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>1.6</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+    </build>
+
+   <profiles>
+      <profile>
+            <id>jvnet-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalJOptions>