You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/11/04 10:47:26 UTC

[myfaces-tobago] branch master updated: Examples: tobago.version configurable

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new f1a4877  Examples: tobago.version configurable
f1a4877 is described below

commit f1a48775e9e0d0f9342e5d37cc819aba5b96baf5
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Nov 4 11:44:04 2020 +0100

    Examples: tobago.version configurable
    
    * This might be helpful for your own application with tobago-example/pom.xml
    as parent pom. Your versioning is independent from the local project version, now.
---
 tobago-example/pom.xml                         | 29 +++++++++++++-------------
 tobago-example/tobago-example-assembly/pom.xml |  6 +++---
 tobago-example/tobago-example-demo/pom.xml     | 12 +++++------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 0125f5a..a379ab7 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -29,6 +29,7 @@
   <properties>
     <app.packaging>war</app.packaging>
     <quarkus.version>1.5.2.Final</quarkus.version>
+    <tobago.version>${project.version}</tobago.version>
   </properties>
 
   <modules>
@@ -92,32 +93,32 @@
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-charlotteville</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-roxborough</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-scarborough</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-speyside</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-standard</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-core</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>jakarta.enterprise</groupId>
@@ -145,7 +146,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-dev</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -229,7 +230,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-mojarra</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -330,7 +331,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-dev</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
@@ -385,7 +386,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-owb</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -403,7 +404,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-dev</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
       </dependencies>
     </profile>
@@ -451,7 +452,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-owb</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
           <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -469,7 +470,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-dev</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
         <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
           <groupId>javax.xml.bind</groupId>
@@ -502,7 +503,7 @@
         <dependency>
           <groupId>org.apache.myfaces.tobago</groupId>
           <artifactId>tobago-config-dev</artifactId>
-          <version>${project.version}</version>
+          <version>${tobago.version}</version>
         </dependency>
       </dependencies>
       <build>
diff --git a/tobago-example/tobago-example-assembly/pom.xml b/tobago-example/tobago-example-assembly/pom.xml
index 0c0ba1d..e1db463 100644
--- a/tobago-example/tobago-example-assembly/pom.xml
+++ b/tobago-example/tobago-example-assembly/pom.xml
@@ -52,13 +52,13 @@
                     <artifactItem>
                       <groupId>${project.groupId}</groupId>
                       <artifactId>tobago-example-demo</artifactId>
-                      <version>${project.version}</version>
+                      <version>${tobago.version}</version>
                       <type>war</type>
                     </artifactItem>
                     <artifactItem>
                       <groupId>${project.groupId}</groupId>
                       <artifactId>tobago-example-blank</artifactId>
-                      <version>${project.version}</version>
+                      <version>${tobago.version}</version>
                       <type>war</type>
                     </artifactItem>
                   </artifactItems>
@@ -80,7 +80,7 @@
                   <descriptors>
                     <descriptor>src/main/assembly/dep.xml</descriptor>
                   </descriptors>
-                  <finalName>myfaces-tobago-${project.version}</finalName>
+                  <finalName>myfaces-tobago-${tobago.version}</finalName>
                   <outputDirectory>target/assembly/out</outputDirectory>
                   <workDirectory>target/assembly/work</workDirectory>
                   <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index cda6937..2bf140e 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-config-dev</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <!-- xxx remove me before release !!! -->
 
@@ -196,14 +196,14 @@
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-core</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-tool-test</artifactId>
-      <version>${project.version}</version>
+      <version>${tobago.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -256,7 +256,7 @@
                     <artifactItem>
                       <groupId>org.apache.myfaces.tobago</groupId>
                       <artifactId>tobago-theme-standard</artifactId>
-                      <version>${project.version}</version>
+                      <version>${tobago.version}</version>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -524,7 +524,7 @@
               <dependency>
                 <groupId>org.apache.myfaces.tobago</groupId>
                 <artifactId>tobago-core</artifactId>
-                <version>${project.version}</version>
+                <version>${tobago.version}</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -543,7 +543,7 @@
             <configuration>
               <images>
                 <image>
-                  <name>myfaces/tobago-example-demo:${project.version}</name>
+                  <name>myfaces/tobago-example-demo:${tobago.version}</name>
                   <run>
                     <ports>
                       <port>8080:8080</port>