[jaxb~v2:1e351ddc] Fix version in *.properties for sources jar

  • From: snajper@...
  • To: commits@...
  • Subject: [jaxb~v2:1e351ddc] Fix version in *.properties for sources jar
  • Date: Tue, 13 Aug 2013 16:32:58 +0000

Project:    jaxb
Repository: v2
Revision:   1e351ddc3639980b0927e2605cf0f9315ae57b52
Author:     snajper
Date:       2013-08-13 16:32:06 UTC
Link:       

Log Message:
------------
Fix version in *.properties for sources jar



Revisions:
----------
1e351ddc3639980b0927e2605cf0f9315ae57b52


Modified Paths:
---------------
jaxb-ri/jxc/pom.xml
jaxb-ri/runtime/jaxb1/src/main/resources/com/sun/xml/bind/Messages.properties
jaxb-ri/xjc/pom.xml
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_de.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_es.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_fr.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_it.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ja.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ko.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_pt_BR.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_CN.properties
jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_TW.properties


Diffs:
------
--- a/jaxb-ri/jxc/pom.xml
+++ b/jaxb-ri/jxc/pom.xml
@@ -88,7 +88,9 @@ holder.
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/*.properties</exclude>
+                </excludes>
             </resource>
         </resources>
         <plugins>
@@ -102,6 +104,64 @@ holder.
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <skipSource>${skipSources}</skipSource>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    
<directory>${project.build.outputDirectory}</directory>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 --- 
a/jaxb-ri/runtime/jaxb1/src/main/resources/com/sun/xml/bind/Messages.properties
+++ 
b/jaxb-ri/runtime/jaxb1/src/main/resources/com/sun/xml/bind/Messages.properties
@@ -51,7 +51,7 @@ DefaultJAXBContextImpl.CICINotNull = \
 ContextFactory.IncorrectVersion = \
        The specified package "{0}" is incompatible with the current JAXB 
runtime.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<resources filter>
 DefaultJAXBContextImpl.buildID = \
        ${version}
 --- a/jaxb-ri/xjc/pom.xml
+++ b/jaxb-ri/xjc/pom.xml
@@ -107,7 +107,9 @@ holder.
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/*.properties</exclude>
+                </excludes>
             </resource>
         </resources>
         <plugins>
@@ -122,9 +124,40 @@ holder.
                 </configuration>
             </plugin>
             <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <skipSource>${skipSources}</skipSource>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>copy-resources</id>
                         <phase>validate</phase>
                         <goals>
@@ -142,6 +175,28 @@ holder.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>add-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    
<directory>${project.build.outputDirectory}</directory>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle.properties
@@ -186,7 +186,7 @@ Driver.CompilingSchema = \
 Driver.FailedToGenerateCode = \
        Failed to produce code.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = \
        This file was generated by the JavaTM Architecture for XML 
Binding(JAXB) Reference Implementation, v${version} \n\
        See <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> \n\--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_de.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_de.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = Ein Schema wird kompiliert ...
 
 Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for 
XML Binding(JAXB) Reference Implementation, v${version} generiert \nSiehe <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
\n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des 
Quellschemas verloren. \nGeneriert: {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_es.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_es.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = Compilando un esquema...
 
 Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura 
JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML 
v${version} \nVisite <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> \nTodas 
las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a 
compilar el esquema de origen. \nGenerado el: {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_fr.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_fr.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = compilation d'un sch\u00e9ma...
 
 Driver.FailedToGenerateCode = Echec de la production du code.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 
par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML 
Binding (JAXB), v${version} \nVoir <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> \nToute 
modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la 
recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_it.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_it.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = compilazione di uno schema in 
corso...
 
 Driver.FailedToGenerateCode = Produzione del codice non riuscita.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = Questo file \u00e8 stato generato 
dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, 
v${version} \nVedere <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
\nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione 
dello schema di origine. \nGenerato il: {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ja.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ja.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = 
\u30b9\u30ad\u30fc\u30de\u306e\u30b3\u30f3\u30d1\u30a4\
 
 Driver.FailedToGenerateCode = 
\u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = 
\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML 
Binding(JAXB) Reference 
Implementation\u3001v${version}\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f
 \n<a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044
 
\n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002
 \n\u751f\u6210\u65e5: {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ko.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_ko.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = \uc2a4\ud0a4\ub9c8\ub97c 
\ucef4\ud30c\uc77c\ud558\ub294
 
 Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 
\uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM 
Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 ${version} 
\ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. 
\n<a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a>\ub97c 
\ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 
\uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c 
\uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 
\uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
 
 Driver.Version = XJC ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_pt_BR.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_pt_BR.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = compilando um esquema...
 
 Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM 
para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, 
v${version} \nConsulte <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> \nTodas 
as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a 
recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_CN.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_CN.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = 
\u6b63\u5728\u7f16\u8bd1\u6a21\u5f0f...
 
 Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM 
Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v${version} 
\u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
\n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, 
\u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4:
 {0} \n
 
 Driver.Version = xjc ${version}--- 
a/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_TW.properties
+++ 
b/jaxb-ri/xjc/src/main/resources/com/sun/tools/xjc/MessageBundle_zh_TW.properties
@@ -111,7 +111,7 @@ Driver.CompilingSchema = 
\u6b63\u5728\u7de8\u8b6f\u7db1\u8981...
 
 Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc.
 
-# DO NOT localize the ${version} string - it is a token for an ant 
<replaceFilter>
+# DO NOT localize the ${version} string - it is a token for an mvn 
<properties filter>
 Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM 
Architecture for XML Binding(JAXB) Reference Implementation, v${version} 
\u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a 
href="http://java.sun.com/xml/jaxb";>http://java.sun.com/xml/jaxb</a> 
\n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, 
\u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931.
 \n\u7522\u751f\u6642\u9593: {0} \n
 
 Driver.Version = xjc ${version}





[jaxb~v2:1e351ddc] Fix version in *.properties for sources jar

snajper 08/13/2013
Terms of Use; Privacy Policy; Copyright ©2013-2015 (revision 20150626.29986a4)
 
 
Close
loading
Please Confirm
Close