Changeset 5455


Ignore:
Timestamp:
Mar 17, 2020, 1:44:31 PM (2 years ago)
Author:
Christian Schulte
Message:

o Updated to latest 2.0.0-SNAPSHOT parent pom.

See #142

Location:
jomc-ri/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • jomc-ri/trunk/pom.xml

    r5402 r5455  
    3535    <groupId>org.jomc</groupId>
    3636    <artifactId>jomc-pom</artifactId>
    37     <version>1.6</version>
     37    <version>2.0.0-SNAPSHOT</version>
    3838  </parent>
    3939  <modelVersion>4.0.0</modelVersion>
    … …  
    155155      <groupId>org.jomc</groupId>
    156156      <artifactId>jomc-util</artifactId>
    157       <version>1.10</version>
     157      <version>2.0.0-SNAPSHOT</version>
    158158      <scope>compile</scope>
    159159    </dependency>
    … …  
    173173      <groupId>org.jomc</groupId>
    174174      <artifactId>jomc-jls</artifactId>
    175       <version>1.7.0</version>
     175      <version>11.7.0-SNAPSHOT</version>
    176176      <scope>compile</scope>
    177177    </dependency>
    … …  
    202202    </site>
    203203  </distributionManagement>
     204  <properties>
     205    <jomc.module.name>org.jomc.ri</jomc.module.name>
     206  </properties>
    204207  <profiles>
    205208    <profile>
    … …  
    218221      </dependencies>
    219222    </profile>
     223    <profile>
     224      <id>jdk11</id>
     225      <activation>
     226        <jdk>11</jdk>
     227      </activation>
     228      <dependencies>
     229        <dependency>
     230          <groupId>jakarta.annotation</groupId>
     231          <artifactId>jakarta.annotation-api</artifactId>
     232          <version>1.3.5</version>
     233          <scope>compile</scope>
     234          <optional>true</optional>
     235        </dependency>
     236        <!-- dependency>
     237          <groupId>jakarta.activation</groupId>
     238          <artifactId>jakarta.activation-api</artifactId>
     239          <version>1.2.2</version>
     240          <scope>compile</scope>
     241        </dependency -->
     242        <dependency>
     243          <groupId>jakarta.xml.bind</groupId>
     244          <artifactId>jakarta.xml.bind-api</artifactId>
     245          <version>2.3.3</version>
     246          <scope>compile</scope>
     247        </dependency>
     248        <dependency>
     249          <groupId>org.glassfish.jaxb</groupId>
     250          <artifactId>jaxb-runtime</artifactId>
     251          <version>2.3.2</version>
     252          <scope>runtime</scope>
     253        </dependency>
     254        <dependency>
     255          <!-- Needed for javax.rmi.PortableRemoteObject only. -->
     256          <groupId>org.glassfish.corba</groupId>
     257          <artifactId>glassfish-corba-omgapi</artifactId>
     258          <version>4.2.1</version>
     259          <scope>provided</scope>
     260        </dependency>
     261      </dependencies>
     262    </profile>
    220263  </profiles>
    221264</project>

  • jomc-ri/trunk/src/main/java/org/jomc/ri/DefaultLocator.java

    r5409 r5455  
    186186            if ( !this.isLocationSupported( location ) )
    187187            {
    188                 throw new IOException( getUnsupportedUriSchemeMessage( Locale.getDefault(), location.getScheme() ) );
     188                throw new IOException( getUnsupportedUriMessage( Locale.getDefault(), location.toASCIIString() ) );
    189189            }
    190190
    … …  
    314314    }
    315315    /**
    316      * Gets the text of the {@code <Unsupported URI Scheme Message>} message.
     316     * Gets the text of the {@code <Unsupported URI Message>} message.
    317317     * <p><dl>
    318318     *   <dt><b>Languages:</b></dt>
    … …  
    322322     * </dl></p>
    323323     * @param locale The locale of the message to return.
    324      * @param schemeInfo Format argument.
    325      * @return The text of the {@code <Unsupported URI Scheme Message>} message for {@code locale}.
     324     * @param uriInfo Format argument.
     325     * @return The text of the {@code <Unsupported URI Message>} message for {@code locale}.
    326326     * @throws org.jomc.ObjectManagementException if getting the message instance fails.
    327327     */
    328328    @SuppressWarnings({"unchecked", "unused", "PMD.UnnecessaryFullyQualifiedName"})
    329329    @javax.annotation.Generated( value = "org.jomc.tools.SourceFileProcessor 2.0.0-SNAPSHOT", comments = "See http://www.jomc.org/jomc-tools/2.0.0-SNAPSHOT" )
    330     private static String getUnsupportedUriSchemeMessage( final java.util.Locale locale, final java.lang.String schemeInfo )
     330    private static String getUnsupportedUriMessage( final java.util.Locale locale, final java.lang.String uriInfo )
    331331    {
    332332        java.io.BufferedReader reader = null;
    … …  
    334334        try
    335335        {
    336             final String message = java.text.MessageFormat.format( java.util.ResourceBundle.getBundle( "org.jomc.ri.DefaultLocator", locale ).getString( "Unsupported URI Scheme Message" ), schemeInfo, (Object) null );
     336            final String message = java.text.MessageFormat.format( java.util.ResourceBundle.getBundle( "org.jomc.ri.DefaultLocator", locale ).getString( "Unsupported URI Message" ), uriInfo, (Object) null );
    337337            final java.lang.StringBuilder builder = new java.lang.StringBuilder( message.length() );
    338338            reader = new java.io.BufferedReader( new java.io.StringReader( message ) );

  • jomc-ri/trunk/src/main/resources/META-INF/jomc.xml

    r5369 r5455  
    463463      </authors>
    464464      <messages>
    465         <message name="Unsupported URI Scheme Message">
    466           <template defaultLanguage="en">
    467             <text language="en">URI scheme ''{0}'' is not supported.</text>
    468             <text language="de">Keine Unterstützung für URI Schema ''{0}''.</text>
    469           </template>
    470           <arguments>
    471             <argument index="0" name="Scheme Info"/>
     465        <message name="Unsupported URI Message">
     466          <template defaultLanguage="en">
     467            <text language="en">URI ''{0}'' is not supported.</text>
     468            <text language="de">Keine Unterstützung für URI ''{0}''.</text>
     469          </template>
     470          <arguments>
     471            <argument index="0" name="URI Info"/>
    472472          </arguments>
    473473        </message>

  • jomc-ri/trunk/src/test/resources/META-INF/jomc.xml

    r5038 r5455  
    4242
    4343  <specifications>
     44    <!-- *********************************************************************************************************** -->
     45    <specification identifier="java.util.Locale"
     46                   class="java.util.Locale"
     47                   version="1.1">
     48      <!--
     49      Specification got added during working on 2.0.0. Recent JDKs no longer
     50      provide version information. For files relying on the former behaviour,
     51      this specification is added here to provide the version manually.
     52      -->
     53    </specification>
    4454    <!-- *********************************************************************************************************** -->
    4555    <specification identifier="${project.name} ⁑ Tests ⁑ Test Specification"
Note: See TracChangeset for help on using the changeset viewer.