You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ab...@apache.org on 2025/01/16 14:54:39 UTC
(cassandra-java-driver) branch 4.x updated (8c1009959 -> 342e2dcf4)
This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a change to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
from 8c1009959 Upgrade Guava to 33.3.1-jre
new 75a269d04 Do not always cleanup Guava shaded module before packaging
new 01671d992 Revert "Do not always cleanup Guava shaded module before packaging"
new 342e2dcf4 Conditionally compile shaded Guava module
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
guava-shaded/pom.xml | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra-java-driver) 02/03: Revert "Do not always cleanup Guava shaded module before packaging"
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
commit 01671d99247bdc783c832c128a8570ba846875c4
Author: Lukasz Antoniak <Lu...@gmail.com>
AuthorDate: Fri Jan 10 16:05:42 2025 +0100
Revert "Do not always cleanup Guava shaded module before packaging"
This reverts commit 5be52ec1a8d014c81566180c731b828a591082da.
---
guava-shaded/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index 6a22663e9..f480f9258 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -94,6 +94,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-classes</id>
+ <phase>package</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <directory>${project.build.outputDirectory}</directory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra-java-driver) 03/03: Conditionally compile shaded Guava module
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
commit 342e2dcf47afab238f357ac2afde65b079ce6b79
Author: Lukasz Antoniak <Lu...@gmail.com>
AuthorDate: Fri Jan 10 16:16:26 2025 +0100
Conditionally compile shaded Guava module
---
guava-shaded/pom.xml | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index f480f9258..ca8f0161b 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -56,6 +56,32 @@
</dependencies>
<build>
<plugins>
+ <plugin>
+ <!--
+ Do not attempt to recompile the module if we are not running JVM 1.8.
+ Having additional Java source files and having to shade Guava will break
+ in CI environment, when we run 'mvn verify' on newer JVM and assume that
+ all classes have been compiled with JVM 1.8.
+ -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.12</version>
+ <executions>
+ <execution>
+ <id>regex-property</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>maven.main.skip</name>
+ <value>${java.version}</value>
+ <regex>^(?!1.8).+</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
@@ -95,6 +121,12 @@
</executions>
</plugin>
<plugin>
+ <!--
+ Cleaning up target directory is required, because module's Java source files
+ (e.g. LexicographicalComparatorHolderSubstitution) will be left with
+ their original Java package AND eventually shaded one. This plugin removes
+ the Java class from its unshaded package.
+ -->
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra-java-driver) 01/03: Do not always cleanup Guava shaded module before packaging
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
absurdfarce pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
commit 75a269d04d49630032be6afedae2ded0c4334e42
Author: Lukasz Antoniak <Lu...@gmail.com>
AuthorDate: Mon Dec 30 07:18:06 2024 +0100
Do not always cleanup Guava shaded module before packaging
---
guava-shaded/pom.xml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/guava-shaded/pom.xml b/guava-shaded/pom.xml
index f480f9258..6a22663e9 100644
--- a/guava-shaded/pom.xml
+++ b/guava-shaded/pom.xml
@@ -94,21 +94,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <id>clean-classes</id>
- <phase>package</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <directory>${project.build.outputDirectory}</directory>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org