You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2022/02/18 10:13:31 UTC
[myfaces-tobago] branch TOBAGO-1999_Select2 updated: cherrypicking changes from 2.x
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/TOBAGO-1999_Select2 by this push:
new a7b32b3 cherrypicking changes from 2.x
a7b32b3 is described below
commit a7b32b3486100d41134ba5e3f32f26ab74ac06ed
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Mon Feb 14 10:46:15 2022 +0100
cherrypicking changes from 2.x
---
pom.xml | 58 +++++++++++-----------
tobago-core/pom.xml | 54 +-------------------
.../internal/taglib/component/package-info.java | 4 +-
.../internal/taglib/extension/package-info.java | 4 +-
tobago-example/pom.xml | 4 +-
.../tobago-example-addressbook-cdi/pom.xml | 6 +--
tobago-example/tobago-example-addressbook/pom.xml | 4 +-
tobago-example/tobago-example-demo/pom.xml | 16 +++---
tobago-example/tobago-example-sandbox/pom.xml | 5 --
tobago-extension/tobago-sandbox/pom.xml | 3 +-
.../internal/taglib/sandbox/package-info.java | 4 +-
tobago-theme/tobago-theme-charlotteville/pom.xml | 23 +--------
tobago-theme/tobago-theme-example/pom.xml | 18 -------
tobago-theme/tobago-theme-richmond/pom.xml | 22 --------
tobago-theme/tobago-theme-scarborough/pom.xml | 22 +-------
tobago-theme/tobago-theme-speyside/pom.xml | 22 +-------
tobago-theme/tobago-theme-standard/pom.xml | 20 +-------
tobago-tool/tobago-theme-plugin/pom.xml | 13 +++--
tobago-tool/tobago-tool-apt/pom.xml | 7 +--
19 files changed, 67 insertions(+), 242 deletions(-)
diff --git a/pom.xml b/pom.xml
index 17e524f..cb23bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,21 +42,22 @@
<mojarra20.version>2.0.11-04</mojarra20.version>
<mojarra21.version>2.1.29-11</mojarra21.version>
<mojarra22.version>2.2.20</mojarra22.version>
- <slf4j.version>1.7.35</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.10</logback.version>
<log4j.version>2.17.1</log4j.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
- <commons-logging.version>1.1.1</commons-logging.version>
+ <commons-logging.version>1.2</commons-logging.version>
<commons-collection.version>3.2.2</commons-collection.version>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
<maven.compile.encoding>UTF-8</maven.compile.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
- <required.maven.version>2.2.1</required.maven.version>
+ <required.maven.version>3.3.1</required.maven.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
- <checkstyle.version>8.45.1</checkstyle.version>
+ <checkstyle.version>9.3</checkstyle.version>
+ <!-- XXX use 16, if released -->
<checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
@@ -237,12 +238,12 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -406,7 +407,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce</id>
@@ -491,7 +492,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.17</version>
+ <version>1.21</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
@@ -541,7 +542,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.4</version>
+ <version>3.16.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -550,7 +551,7 @@
</plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.7.0</version>
<executions>
<execution>
<goals>
@@ -570,7 +571,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.2.2</version>
<configuration>
<archive>
<manifest>
@@ -599,7 +600,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.10.0</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -613,7 +614,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
@@ -638,7 +639,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10.4</version>
<configuration>
<!-- switched off check in Java 8 -->
<additionalparam>-Xdoclint:none</additionalparam>
@@ -674,11 +675,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>3.2.1</version>
<executions>
<!-- here we override the super-pom attach-sources executionid which
calls sources:jar goal. That goals forks the lifecycle, causing
@@ -700,7 +701,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.5</version>
+ <version>1.12.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -778,17 +779,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <groupId>org.bsc.maven</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <version>2.2.4</version>
+ <version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>6.5.1</version>
+ <version>6.5.3</version>
<configuration>
<failBuildOnCVSS>0</failBuildOnCVSS>
<suppressionFile>tobago/dependency-check-suppression-for-tobago-2.x.xml</suppressionFile>
@@ -863,7 +859,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -883,7 +879,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -897,6 +893,9 @@
<message>Tobago must be compiled with Java 8</message>
<version>[1.8.0-100,1.8.0-999]</version>
</requireJavaVersion>
+ <requireReleaseDeps>
+ <message>No snapshots allowed in a release!</message>
+ </requireReleaseDeps>
</rules>
</configuration>
</execution>
@@ -930,7 +929,6 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -942,7 +940,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10.4</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -986,7 +984,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>validate</phase>
@@ -1029,7 +1027,7 @@
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.2</version>
+ <version>1.0.6</version>
</dependency>
</dependencies>
<executions>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index ecc77f4..701abf9 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>3.2.2</version>
<executions>
<execution>
<id>test-jar</id>
@@ -74,11 +74,6 @@
<goal>test-jar</goal>
</goals>
</execution>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
</executions>
<configuration>
<archive>
@@ -206,53 +201,6 @@
<profiles>
<profile>
- <id>codegen-old-jdk</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.bsc.maven</groupId>
- <artifactId>maven-processor-plugin</artifactId>
- <executions>
- <execution>
- <id>process</id>
- <goals>
- <goal>process</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <!-- source output directory -->
- <outputDirectory>${project.build.directory}/generated</outputDirectory>
- <processors>
- <processor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.TaglibGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.FacesConfigGenerator</processor>
- <processor>org.apache.myfaces.tobago.apt.processor.CheckstyleConfigGenerator</processor>
- </processors>
- <optionMap>
- <sourceFacesConfig>${basedir}/src/main/faces-config/faces-config.xml</sourceFacesConfig>
- <targetFacesConfig>META-INF/faces-config.xml</targetFacesConfig>
- <targetTaglib>META-INF</targetTaglib>
- <targetCheckstyle>META-INF</targetCheckstyle>
- <jsfVersion>${jsf.target}</jsfVersion>
- </optionMap>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>codegen-recent-jdk</id>
<activation>
<jdk>!1.6</jdk>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
index 84de4b8..6698e6e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * <b>Tobago Framework Component Tag Library 2.4.x -
+ * <b>Tobago Framework Component Tag Library 2.4.5 -
* (C) Copyright 2005-2021 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
@@ -28,6 +28,6 @@
"org.apache.myfaces.tobago.webapp.TobagoServletContextListener",
"org.apache.myfaces.tobago.webapp.SecretSessionListener"},
name = "tobago",
- displayName = "Tobago Components 2.4.x")
+ displayName = "Tobago Components 2.4.5")
package org.apache.myfaces.tobago.internal.taglib.component;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
index 75cb6bb..48188ad 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
@@ -18,13 +18,13 @@
*/
/**
- * <b>Tobago Framework Extension Tag Library 2.4.x -
+ * <b>Tobago Framework Extension Tag Library 2.4.5 -
* (C) Copyright 2005-2021 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tx",
uri = "http://myfaces.apache.org/tobago/extension",
name = "tobago-extension",
- displayName = "Tobago Extensions 2.4.x")
+ displayName = "Tobago Extensions 2.4.5")
package org.apache.myfaces.tobago.internal.taglib.extension;
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index c0bcbb9..ad7b9c6 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>3.0.1-b04</version>
+ <version>3.0.1-b06</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -430,7 +430,7 @@
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.3.Final</version>
+ <version>7.9.Final</version>
</plugin>
</plugins>
</build>
diff --git a/tobago-example/tobago-example-addressbook-cdi/pom.xml b/tobago-example/tobago-example-addressbook-cdi/pom.xml
index 567902b..dd9bfde 100644
--- a/tobago-example/tobago-example-addressbook-cdi/pom.xml
+++ b/tobago-example/tobago-example-addressbook-cdi/pom.xml
@@ -30,7 +30,7 @@
<properties>
<openjpa.version>1.2.3</openjpa.version>
<openwebbeans.version>1.2.8</openwebbeans.version>
- <deltaspike.version>1.9.4</deltaspike.version>
+ <deltaspike.version>1.9.5</deltaspike.version>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
</properties>
<build>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<!-- XXX websphere-provided -->
<scope>provided</scope>
</dependency>
@@ -287,7 +287,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.12.1.1</version>
+ <version>10.15.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/tobago-example/tobago-example-addressbook/pom.xml b/tobago-example/tobago-example-addressbook/pom.xml
index 578e441..90c61a8 100644
--- a/tobago-example/tobago-example-addressbook/pom.xml
+++ b/tobago-example/tobago-example-addressbook/pom.xml
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.12.1.1</version>
+ <version>10.15.2.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -215,7 +215,7 @@
<properties>
<openjpa.version>1.2.3</openjpa.version>
- <spring.version>4.3.29.RELEASE</spring.version>
+ <spring.version>4.3.30.RELEASE</spring.version>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
</properties>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 90b74af..2a6eaa1 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -29,7 +29,7 @@
<properties>
<openwebbeans.version>1.2.8</openwebbeans.version>
- <deltaspike.version>1.9.4</deltaspike.version>
+ <deltaspike.version>1.9.5</deltaspike.version>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
</properties>
<build>
@@ -222,7 +222,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -315,7 +315,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -373,7 +373,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -431,7 +431,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -489,7 +489,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -547,7 +547,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/tobago-example/tobago-example-sandbox/pom.xml b/tobago-example/tobago-example-sandbox/pom.xml
index 47e4c47..16a7157 100644
--- a/tobago-example/tobago-example-sandbox/pom.xml
+++ b/tobago-example/tobago-example-sandbox/pom.xml
@@ -67,11 +67,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.sun.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.0</version>
- </dependency>
</dependencies>
<properties>
<tobago.basedir>${project.basedir}/../..</tobago.basedir>
diff --git a/tobago-extension/tobago-sandbox/pom.xml b/tobago-extension/tobago-sandbox/pom.xml
index 6ab6d4f..994c176 100644
--- a/tobago-extension/tobago-sandbox/pom.xml
+++ b/tobago-extension/tobago-sandbox/pom.xml
@@ -63,7 +63,7 @@
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
- <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*</includes>
+ <includes>org/apache/myfaces/tobago/internal/taglib/declaration/**/*</includes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/tobago-core-sources</outputDirectory>
@@ -74,6 +74,7 @@
<plugin>
<groupId>org.bsc.maven</groupId>
<artifactId>maven-processor-plugin</artifactId>
+ <version>4.5-jdk8</version>
<executions>
<execution>
<id>process</id>
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
index ed0f555..5d7245a 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
@@ -18,7 +18,7 @@
*/
/**
- * <b>Tobago Framework Sandbox Tag Library 2.4.x -
+ * <b>Tobago Framework Sandbox Tag Library 2.4.5 -
* (C) Copyright 2002-2021 The Apache Software Foundation</b>
*
* <b>Warning: The sandbox tag library contains unstable components.
@@ -28,6 +28,6 @@
shortName = "tcs",
uri = "http://myfaces.apache.org/tobago/sandbox",
name = "tobago-sandbox",
- displayName = "Tobago Sandbox 2.4.x")
+ displayName = "Tobago Sandbox 2.4.5")
package org.apache.myfaces.tobago.internal.taglib.sandbox;
diff --git a/tobago-theme/tobago-theme-charlotteville/pom.xml b/tobago-theme/tobago-theme-charlotteville/pom.xml
index b1acae7..44603f5 100644
--- a/tobago-theme/tobago-theme-charlotteville/pom.xml
+++ b/tobago-theme/tobago-theme-charlotteville/pom.xml
@@ -24,28 +24,7 @@
</parent>
<artifactId>tobago-theme-charlotteville</artifactId>
<name>Tobago Theme Charlotteville</name>
- <build>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
diff --git a/tobago-theme/tobago-theme-example/pom.xml b/tobago-theme/tobago-theme-example/pom.xml
index 355958e..765f14c 100644
--- a/tobago-theme/tobago-theme-example/pom.xml
+++ b/tobago-theme/tobago-theme-example/pom.xml
@@ -62,24 +62,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/tobago-theme/tobago-theme-richmond/pom.xml b/tobago-theme/tobago-theme-richmond/pom.xml
index 68b81a4..d45c580 100644
--- a/tobago-theme/tobago-theme-richmond/pom.xml
+++ b/tobago-theme/tobago-theme-richmond/pom.xml
@@ -25,28 +25,6 @@
<artifactId>tobago-theme-richmond</artifactId>
<packaging>jar</packaging>
<name>Tobago Theme Richmond</name>
- <build>
- <plugins>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
diff --git a/tobago-theme/tobago-theme-scarborough/pom.xml b/tobago-theme/tobago-theme-scarborough/pom.xml
index 5e2ca3f..f11120f 100644
--- a/tobago-theme/tobago-theme-scarborough/pom.xml
+++ b/tobago-theme/tobago-theme-scarborough/pom.xml
@@ -78,7 +78,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>compress-standard</id>
@@ -102,24 +102,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -141,7 +123,7 @@
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <version>1.6R2</version>
+ <version>1.7R2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tobago-theme/tobago-theme-speyside/pom.xml b/tobago-theme/tobago-theme-speyside/pom.xml
index 193200c..8eeaeb6 100644
--- a/tobago-theme/tobago-theme-speyside/pom.xml
+++ b/tobago-theme/tobago-theme-speyside/pom.xml
@@ -100,7 +100,7 @@
<plugin>
<groupId>org.lesscss</groupId>
<artifactId>lesscss-maven-plugin</artifactId>
- <version>1.3.0</version>
+ <version>1.7.0.1.1</version>
<executions>
<execution>
<goals>
@@ -112,26 +112,6 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <sourceDirectory>${project.build.directory}/classes</sourceDirectory>
- <excludes>
- <exclude>**/*.js</exclude>
- <exclude>**/*.min.css</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<properties>
diff --git a/tobago-theme/tobago-theme-standard/pom.xml b/tobago-theme/tobago-theme-standard/pom.xml
index 83a09b7..ba5975a 100644
--- a/tobago-theme/tobago-theme-standard/pom.xml
+++ b/tobago-theme/tobago-theme-standard/pom.xml
@@ -70,7 +70,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>compress-standard</id>
@@ -114,24 +114,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compress</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <suffix>.min</suffix>
- <excludes>
- <exclude>**/*.js</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/tobago-tool/tobago-theme-plugin/pom.xml b/tobago-tool/tobago-theme-plugin/pom.xml
index c07e575..d81174f 100644
--- a/tobago-tool/tobago-theme-plugin/pom.xml
+++ b/tobago-tool/tobago-theme-plugin/pom.xml
@@ -25,7 +25,7 @@
<artifactId>tobago-theme-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Tobago Maven2 Theme Plugin</name>
-
+
<!--scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/tobago-theme-plugin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/tobago-theme-plugin</developerConnection>
@@ -37,21 +37,24 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.5.1</version>
+ <version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -62,11 +65,12 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
- <version>1.5.3</version>
+ <version>2.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -82,13 +86,14 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
<!-- guava is a dependency of maven-core (set explicitly, because of
setting the version, because of CVE-2020-8908) -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1.1-android</version>
+ <version>31.0.1-android</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/tobago-tool/tobago-tool-apt/pom.xml b/tobago-tool/tobago-tool-apt/pom.xml
index 4554df7..a90c263 100644
--- a/tobago-tool/tobago-tool-apt/pom.xml
+++ b/tobago-tool/tobago-tool-apt/pom.xml
@@ -79,11 +79,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-plugin-java</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.3.0</version>
@@ -96,7 +91,7 @@
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
- <version>2.0.6</version>
+ <version>2.0.6.1</version>
</dependency>
</dependencies>