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 2021/05/26 22:06:00 UTC
[myfaces-tobago] branch master updated: demo(revert): configurable
version reverted
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 d8b1c2e demo(revert): configurable version reverted
d8b1c2e is described below
commit d8b1c2e62b4420cc73bc7bf4e8f124f22ee4a50c
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu May 27 00:05:10 2021 +0200
demo(revert): configurable version reverted
this doesn't work with the maven release plugin
---
tobago-example/pom.xml | 27 +++++++++++++-------------
tobago-example/tobago-example-assembly/pom.xml | 6 +++---
tobago-example/tobago-example-demo/pom.xml | 12 ++++++------
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index eac2ed4..af32f07 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -29,7 +29,6 @@
<properties>
<app.packaging>war</app.packaging>
<quarkus.version>1.13.4.Final</quarkus.version>
- <tobago.version>${project.version}</tobago.version>
</properties>
<modules>
@@ -95,32 +94,32 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-roxborough</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
@@ -148,7 +147,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-dev</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -222,7 +221,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-mojarra</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- from https://eclipse-ee4j.github.io/mojarra/ [BEGIN] -->
<dependency>
@@ -349,7 +348,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-dev</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -393,7 +392,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -453,7 +452,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -471,7 +470,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-dev</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
<groupId>javax.xml.bind</groupId>
@@ -504,7 +503,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-dev</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/tobago-example/tobago-example-assembly/pom.xml b/tobago-example/tobago-example-assembly/pom.xml
index 26bd684..46d5276 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>${tobago.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-example-blank</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
<type>war</type>
</artifactItem>
</artifactItems>
@@ -80,7 +80,7 @@
<descriptors>
<descriptor>src/main/assembly/dep.xml</descriptor>
</descriptors>
- <finalName>myfaces-tobago-${tobago.version}</finalName>
+ <finalName>myfaces-tobago-${project.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 cb45468..5da94ab 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -217,14 +217,14 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool-test</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -282,7 +282,7 @@
<artifactItem>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-standard</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -347,7 +347,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -412,7 +412,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-owb</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -430,7 +430,7 @@
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-config-dev</artifactId>
- <version>${tobago.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
<groupId>javax.xml.bind</groupId>