Hello community, here is the log from the commit of package java-11-openjdk for openSUSE:Factory checked in at 2018-09-11 17:20:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-11-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk" Tue Sep 11 17:20:23 2018 rev:21 rq:634877 version:11.0.0.0~28 Changes: -------- --- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes 2018-08-24 17:13:48.902764451 +0200 +++ /work/SRC/openSUSE:Factory/.java-11-openjdk.new/java-11-openjdk.changes 2018-09-11 17:20:37.479104461 +0200 @@ -1,0 +2,9 @@ +Tue Sep 11 06:15:20 UTC 2018 - Fridrich Strba <[email protected]> + +- Update jax-ws-spec and jaxb-spec tarball to the latest versions +- Modified patch: + * annotation-module.patch + + module name change from java.xml.ws.annotation to + java.annotation + +------------------------------------------------------------------- Old: ---- jax-ws-spec-jaxws-api-2.3.1-b171012.0153.tar.gz jaxb-spec-2.3.1.tar.gz New: ---- jax-ws-spec-2.4.0.tar.gz jaxb-spec-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-11-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.9PDC8n/_old 2018-09-11 17:20:45.959091517 +0200 +++ /var/tmp/diff_new_pack.9PDC8n/_new 2018-09-11 17:20:45.963091511 +0200 @@ -47,13 +47,13 @@ %global java_activation_repository activation %global java_activation_tag JAF-1_2_0 %global java_xml_bind_repository jaxb-spec -%global java_xml_bind_tag 2.3.1 +%global java_xml_bind_tag 2.4.0 %global java_xml_soap_repository javax.xml.soap %global java_xml_soap_tag 1.4.0 %global java_xml_ws_annotation_repository javax.annotation %global java_xml_ws_annotation_tag 1.3.2 %global java_xml_ws_repository jax-ws-spec -%global java_xml_ws_tag jaxws-api-2.3.1-b171012.0153 +%global java_xml_ws_tag 2.4.0 # priority must be 6 digits in total %global priority 2105 @@ -570,7 +570,6 @@ %else --disable-aot \ %endif - --disable-zip-debug-info \ --disable-keep-packaged-modules \ --with-debug-level=%{debugbuild} \ --with-zlib=system \ @@ -694,16 +693,16 @@ cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ rm -rf $JAVA_HOME/../newjdk -# Build the java.xml.ws.annotation +# Build the java.annotation pushd %{java_xml_ws_annotation_repository}-%{java_xml_ws_annotation_tag} mkdir -p build $JAVA_HOME/bin/javac -d build `find src/main/java -name \*.java | xargs` -$JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/java.xml.ws.annotation.jmod +$JAVA_HOME/bin/jmod create --class-path=build $JAVA_HOME/../jmods/java.annotation.jmod popd -# Merge java.xml.ws.annotation into the JDK +# Merge java.annotation into the JDK source $JAVA_HOME/release; export MODULES -$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "java.xml.ws.annotation,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk +$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules "java.annotation,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/ rm -rf $JAVA_HOME/../newjdk ++++++ annotation-module.patch ++++++ --- /var/tmp/diff_new_pack.9PDC8n/_old 2018-09-11 17:20:46.071091346 +0200 +++ /var/tmp/diff_new_pack.9PDC8n/_new 2018-09-11 17:20:46.071091346 +0200 @@ -35,7 +35,7 @@ + * Defines a subset of the Common Annotations API to support programs running + * on the Java SE Platform. + */ -+module java.xml.ws.annotation { ++module java.annotation { + exports javax.annotation; +} + ++++++ jax-ws-spec-jaxws-api-2.3.1-b171012.0153.tar.gz -> jax-ws-spec-2.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/copyright-exclude new/jax-ws-spec-2.4.0/api/copyright-exclude --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/copyright-exclude 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/copyright-exclude 2018-08-09 13:52:50.000000000 +0200 @@ -3,10 +3,3 @@ /exclude.xml /LICENSE.txt /offline-javadoc/package-list -/test/README.txt -/test/runtests.sh -/test/src/jaxws/factory/Invalid.java -/test/src/jaxws/factory/Valid.java -/test/src/jaxws/factory/Valid2.java -/test/src/jaxws/factory/Valid3.java -/test/src/jaxws/test/Test.java diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/pom.xml new/jax-ws-spec-2.4.0/api/pom.xml --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/pom.xml 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/pom.xml 2018-08-09 13:52:50.000000000 +0200 @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -50,7 +50,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>javax.xml.ws</groupId> <artifactId>jaxws-api</artifactId> - <version>2.3.1-b171012.0153</version> + <version>2.4.0</version> <packaging>jar</packaging> <name>JAX-WS API</name> @@ -68,8 +68,8 @@ <connection>scm:git:git://github.com/javaee/jax-ws-spec.git</connection> <developerConnection>${scm.developerConnection}</developerConnection> <url>https://github.com/javaee/jax-ws-spec</url> - <tag>jaxws-api-2.3.1-b171012.0153</tag> - </scm> + <tag>2.4.0</tag> + </scm> <licenses> <license> @@ -124,6 +124,11 @@ <artifactId>javax.xml.soap-api</artifactId> <version>${soap.version}</version> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>${javax.annotation-api.version}</version> + </dependency> </dependencies> <properties> @@ -134,7 +139,7 @@ <extension.name>javax.xml.ws</extension.name> <spec.version>2.4</spec.version> <old.spec.version>2.3</old.spec.version> - <jaxb.version>2.3.1-b171012.0343</jaxb.version> + <jaxb.version>2.4.0-b180725.0427</jaxb.version> <soap.version>1.4.0</soap.version> <non.final>false</non.final> @@ -144,6 +149,7 @@ <findbugs.threshold>Low</findbugs.threshold> <maven.build.timestamp.format>yyMMdd.HHmm</maven.build.timestamp.format> <scm.developerConnection>scm:git:[email protected]:javaee/jax-ws-spec.git</scm.developerConnection> + <javax.annotation-api.version>1.3.2</javax.annotation-api.version> </properties> <build> @@ -186,12 +192,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.0.0-M1</version> + <version>3.0.1</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.2.0</version> + <version>3.5.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -311,7 +317,6 @@ <Specification-Vendor>Oracle Corporation</Specification-Vendor> <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> <Implementation-Vendor-Id>org.glassfish</Implementation-Vendor-Id> - <_failok>true</_failok> <!-- FIXME: FELIX-5430 --> </instructions> </configuration> <executions> @@ -331,8 +336,6 @@ <mavenExecutorId>forked-path</mavenExecutorId> <useReleaseProfile>false</useReleaseProfile> <arguments>${release.arguments}</arguments> - <releaseVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-b${maven.build.timestamp}</releaseVersion> - <developmentVersion>${project.version}</developmentVersion> </configuration> </plugin> <plugin> @@ -524,8 +527,6 @@ <configuration> <includeDependencySources>false</includeDependencySources> <additionalJOptions> - <additionalJOption>--add-modules</additionalJOption> - <additionalJOption>java.xml.soap,java.xml.bind,java.xml.ws.annotation</additionalJOption> <additionalJOption>--module-path</additionalJOption> <additionalJOption>${mod.dir}</additionalJOption> </additionalJOptions> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/src/main/jdk9/module-info.java new/jax-ws-spec-2.4.0/api/src/main/jdk9/module-info.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/src/main/jdk9/module-info.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/src/main/jdk9/module-info.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -42,7 +42,7 @@ requires java.xml.bind; requires java.logging; requires java.xml.soap; - requires java.xml.ws.annotation; + requires java.annotation; exports javax.xml.ws; exports javax.xml.ws.handler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/README.txt new/jax-ws-spec-2.4.0/api/test/README.txt --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/README.txt 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/README.txt 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ Tests for JAX-WS API involves several different jdk/ServiceLoader configurations, @@ -34,4 +49,4 @@ 2) ./runtests.sh runs all the scenarios declared in scenarios.sh it just writes results, to be sure nothing is failing, run: - ./runtests.sh |grep FAILED \ No newline at end of file + ./runtests.sh |grep FAILED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/runtests.sh new/jax-ws-spec-2.4.0/api/test/runtests.sh --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/runtests.sh 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/runtests.sh 2018-08-09 13:52:50.000000000 +0200 @@ -1,28 +1,42 @@ #!/bin/sh - # -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. # -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common Development +# and Distribution License("CDDL") (collectively, the "License"). You +# may not use this file except in compliance with the License. You can +# obtain a copy of the License at +# https://oss.oracle.com/licenses/CDDL+GPL-1.1 +# or LICENSE.txt. See the License for the specific +# language governing permissions and limitations under the License. +# +# When distributing the software, include this License Header Notice in each +# file and include the License file at LICENSE.txt. +# +# GPL Classpath Exception: +# Oracle designates this particular file as subject to the "Classpath" +# exception as provided by Oracle in the GPL Version 2 section of the License +# file that accompanied this code. +# +# Modifications: +# If applicable, add the following below the License Header, with the fields +# enclosed by brackets [] replaced by your own identifying information: +# "Portions Copyright [year] [name of copyright owner]" +# +# Contributor(s): +# If you wish your version of this file to be governed by only the CDDL or +# only the GPL Version 2, indicate your decision by adding "[Contributor] +# elects to include this software in this distribution under the [CDDL or GPL +# Version 2] license." If you don't indicate a single choice of license, a +# recipient has the option to distribute your version of this file under +# either the CDDL, the GPL Version 2 or to extend the choice of license to +# its licensees as provided above. However, if you add GPL Version 2 code +# and therefore, elected the GPL Version 2 license, then the option applies +# only if the new code is made subject to such option by the copyright +# holder. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Invalid.java new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Invalid.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Invalid.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Invalid.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ package jaxws.factory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid.java new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ package jaxws.factory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid2.java new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid2.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid2.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid2.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ package jaxws.factory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid3.java new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid3.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/factory/Valid3.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/src/jaxws/factory/Valid3.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ package jaxws.factory; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/test/Test.java new/jax-ws-spec-2.4.0/api/test/src/jaxws/test/Test.java --- old/jax-ws-spec-jaxws-api-2.3.1-b171012.0153/api/test/src/jaxws/test/Test.java 2017-10-12 03:54:00.000000000 +0200 +++ new/jax-ws-spec-2.4.0/api/test/src/jaxws/test/Test.java 2018-08-09 13:52:50.000000000 +0200 @@ -1,26 +1,41 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://oss.oracle.com/licenses/CDDL+GPL-1.1 + * or LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. */ package jaxws.test; ++++++ jaxb-spec-2.3.1.tar.gz -> jaxb-spec-2.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/jaxb-api/pom.xml new/jaxb-spec-2.4.0/jaxb-api/pom.xml --- old/jaxb-spec-2.3.1/jaxb-api/pom.xml 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/jaxb-api/pom.xml 2018-09-06 13:44:52.000000000 +0200 @@ -46,7 +46,7 @@ <parent> <artifactId>jaxb-api-parent</artifactId> <groupId>javax.xml.bind</groupId> - <version>2.3.1</version> + <version>2.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -88,7 +88,7 @@ <configuration> <rules> <requireJavaVersion> - <version>[1.7,)</version> + <version>[1.8,)</version> </requireJavaVersion> <requireMavenVersion> <version>[3.0.3,)</version> @@ -177,7 +177,7 @@ <Specification-Version>${project.version}</Specification-Version> <Export-Package>${extension.name}.*; version=${spec.version}</Export-Package> <Import-Package> - javax.activation, + javax.activation;version=!, javax.xml.bind;version="[${spec.version},3)", javax.xml.bind.annotation;version="[${spec.version},3)", javax.xml.bind.annotation.adapters;version="[${spec.version},3)", @@ -290,18 +290,23 @@ <execution> <id>default-compile</id> <configuration> - <release>9</release> + <release>8</release> + <excludes> + <exclude>module-info.java</exclude> + </excludes> </configuration> </execution> <execution> - <id>base-compile</id> + <id>module-info-compile</id> + <phase>test-compile</phase><!--Avoid JavaSE9 capability added by bundle-plugin--> <goals> <goal>compile</goal> </goals> <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> + <release>9</release> + <includes> + <include>module-info.java</include> + </includes> </configuration> </execution> </executions> @@ -380,6 +385,7 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> + <version>1.8</version> <executions> <execution> <id>compile-java9</id> @@ -387,7 +393,7 @@ <configuration> <tasks> <mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" /> - <javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" /> + <javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" /> </tasks> </configuration> <goals> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java new/jaxb-spec-2.4.0/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java --- old/jaxb-spec-2.3.1/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java 2018-09-06 13:44:52.000000000 +0200 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2003-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -70,19 +70,10 @@ class ContextFinder { /** - * When JAXB is in J2SE, rt.jar has to have a JAXB implementation. - * However, rt.jar cannot have META-INF/services/javax.xml.bind.JAXBContext - * because if it has, it will take precedence over any file that applications have - * in their jar files. - * - * <p> - * When the user bundles his own JAXB implementation, we'd like to use it, and we - * want the platform default to be used only when there's no other JAXB provider. - * - * <p> - * For this reason, we have to hard-code the class name into the API. + * Previously used to point into JavaSE provider now defaults to RI context factory class. + * This will be used as the last resort if none of other resolution mechanism is successful. */ - private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory"; + private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.bind.v2.ContextFactory"; // previous value of JAXBContext.JAXB_CONTEXT_FACTORY, using also this to ensure backwards compatibility private static final String JAXB_CONTEXT_FACTORY_DEPRECATED = "javax.xml.bind.context.factory"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java new/jaxb-spec-2.4.0/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java --- old/jaxb-spec-2.3.1/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java 2018-09-06 13:44:52.000000000 +0200 @@ -142,22 +142,25 @@ * * @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module. */ - static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException { + public static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException { final Module implModule = factorySPI.getModule(); Module jaxbModule = JAXBContext.class.getModule(); for (Class cls : classes) { - final Module classModule = cls.getModule(); - final String packageName = cls.getPackageName(); - //no need for unnamed - if (!classModule.isNamed()) { + Class jaxbClass = cls.isArray() ? + cls.getComponentType() : cls; + + final Module classModule = jaxbClass.getModule(); + final String packageName = jaxbClass.getPackageName(); + //no need for unnamed and java.base types + if (!classModule.isNamed() || classModule.getName().equals("java.base")) { continue; } //report error if they are not open to java.xml.bind if (!classModule.isOpen(packageName, jaxbModule)) { throw new JAXBException(Messages.format(Messages.JAXB_CLASSES_NOT_OPEN, - packageName, cls.getName(), classModule.getName())); + packageName, jaxbClass.getName(), classModule.getName())); } //propagate openness to impl module classModule.addOpens(packageName, implModule); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/jaxb-api-test/pom.xml new/jaxb-spec-2.4.0/jaxb-api-test/pom.xml --- old/jaxb-spec-2.3.1/jaxb-api-test/pom.xml 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/jaxb-api-test/pom.xml 2018-09-06 13:44:52.000000000 +0200 @@ -46,7 +46,7 @@ <parent> <artifactId>jaxb-api-parent</artifactId> <groupId>javax.xml.bind</groupId> - <version>2.3.1</version> + <version>2.4.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java new/jaxb-spec-2.4.0/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java --- old/jaxb-spec-2.3.1/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java 2018-09-06 13:44:52.000000000 +0200 @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2015-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -82,7 +82,7 @@ private static final String FACTORY_ID = "javax.xml.bind.JAXBContextFactory"; private static final String PACKAGE_LEGACY = "jaxb.factory.legacy."; // TODO: ??? private static final String PACKAGE_SPI = "jaxb.factory.spi."; // TODO: ??? - private static final Object DEFAULT = "com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl"; + private static final Object DEFAULT = "com.sun.xml.bind.v2.runtime.JAXBContextImpl"; static { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/pom.xml new/jaxb-spec-2.4.0/pom.xml --- old/jaxb-spec-2.3.1/pom.xml 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/pom.xml 2018-09-06 13:44:52.000000000 +0200 @@ -43,16 +43,17 @@ <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.4.0</version> + <parent> <groupId>net.java</groupId> <artifactId>jvnet-parent</artifactId> <version>5</version> </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api-parent</artifactId> - <version>2.3.1</version> <modules> <module>jaxb-api</module> <module>jaxb-api-test</module> @@ -72,7 +73,7 @@ <connection>scm:git:git://github.com/javaee/jaxb-spec.git</connection> <developerConnection>scm:git:[email protected]:javaee/jaxb-spec.git</developerConnection> <url>https://github.com/javaee/jaxb-spec.git</url> - <tag>2.3.1</tag> + <tag>HEAD</tag> </scm> <developers> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxb-spec-2.3.1/tools/rewrite_poms_git.sh new/jaxb-spec-2.4.0/tools/rewrite_poms_git.sh --- old/jaxb-spec-2.3.1/tools/rewrite_poms_git.sh 2018-07-13 13:21:53.000000000 +0200 +++ new/jaxb-spec-2.4.0/tools/rewrite_poms_git.sh 2018-09-06 13:44:52.000000000 +0200 @@ -42,8 +42,9 @@ # if option -n ... do not commit COMMIT=Y +RELEASE=false -while getopts ":nv:" opt; do +while getopts ":nv:r" opt; do case $opt in n) COMMIT=N @@ -52,6 +53,10 @@ CUSTOM_VERSION=${OPTARG} echo "Using custom version: ${CUSTOM_VERSION}" ;; + r) + RELEASE=true + echo "Using release mode, to append buildnumber remove -r flag." + ;; \?) echo "Invalid option: -$OPTARG" >&2 exit 1 @@ -61,6 +66,7 @@ echo "Script will commit changes: [$COMMIT] (pass option -n not to commit)" CURRENT_VERSION=`cat pom.xml | grep '<version' -m 1 | cut -d ">" -f 2 | cut -d "<" -f 1 | cut -d "-" -f 1` +echo "Current version: ${CURRENT_VERSION}" SCRIPT_DIR=$(cd $(dirname $0); pwd -P) @@ -83,14 +89,21 @@ DEVELOPER_VERSION=${CURRENT_VERSION}-SNAPSHOT RELEASE_QUALIFIER=${BUILD_NUMBER} -if [ -z CUSTOM_VERSION ]; then +if [ -z "${CUSTOM_VERSION}" ]; then echo "No version specified, reading release version from pom file" - RELEASE_VERSION=${CURRENT_VERSION}-${RELEASE_QUALIFIER} + RELEASE_VERSION=${CURRENT_VERSION} else RELEASE_VERSION=${CUSTOM_VERSION} fi; -echo "Release version: ${RELEASE_VERSION}" +if [ "${RELEASE}" = true ]; then + echo "Release version: ${RELEASE_VERSION}" +else + RELEASE_VERSION="${RELEASE_VERSION}-${RELEASE_QUALIFIER}" + echo "Pre-release version: ${RELEASE_VERSION}" +fi; + + RELEASE_TAG=${RELEASE_VERSION}
