You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2021/04/27 11:02:16 UTC
[cassandra] branch cassandra-3.0 updated (ad2f41e -> 4763d56)
This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from ad2f41e Merge branch 'cassandra-2.2' into cassandra-3.0
add bd27026 Only include versioned files in rat-report
new 26163bb Follow up fixes to CASSANDRA-16633
new 4763d56 Merge branch 'cassandra-2.2' into cassandra-3.0
The 2 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:
.build/build-rat.xml | 18 +++++++++++++++++-
build.xml | 4 +---
2 files changed, 18 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
Posted by sa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4763d5625ad225beb3d465c35ea1b9b41ac87009
Merge: ad2f41e 26163bb
Author: Sam Tunnicliffe <sa...@beobal.com>
AuthorDate: Tue Apr 27 11:56:07 2021 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
.build/build-rat.xml | 18 +++++++++++++++++-
build.xml | 4 +---
2 files changed, 18 insertions(+), 4 deletions(-)
diff --cc build.xml
index 89e6937,064d16d..6d533eb
--- a/build.xml
+++ b/build.xml
@@@ -1,4 -1,4 +1,3 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@@ -1860,17 -1920,17 +1859,16 @@@
<delete dir="build/eclipse-classes" />
</target>
-
- <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis">
+ <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis">
<property name="ecj.log.dir" value="${build.dir}/ecj" />
<property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
- <delete dir="${ecj.log.dir}" />
<mkdir dir="${ecj.log.dir}" />
- <property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
+ <property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
+
+ <echo message="Running Eclipse Code Analysis. Output logged to ${ecj.warnings.file}" />
- <echo message="Running Eclipse Code Analysis. Output logged to ${ecj.warnings.file}" />
-
- <java
+ <java
jar="${build.dir.lib}/jars/ecj-${ecj.version}.jar"
fork="true"
failonerror="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org