You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2020/03/21 10:33:28 UTC
[cassandra-in-jvm-dtest-api] branch master updated (a562fd5 ->
5e9bd71)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git.
from a562fd5 Introduce the extracted in-JVM DTest API
new 1cc1e6a Improve build so that it can build releases that meet ASF release requirements.
new 23a786a Add licenses header to pom file
new 5e9bd71 Add gitignore file
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:
.gitignore | 81 ++++++++++++++++++++++
NOTICE.txt | 11 +++
pom.xml | 67 +++++++++++-------
.../cassandra/distributed/shared/AssertUtils.java | 18 +++++
4 files changed, 153 insertions(+), 24 deletions(-)
create mode 100644 .gitignore
create mode 100644 NOTICE.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-in-jvm-dtest-api] 01/03: Improve build so that it can
build releases that meet ASF release requirements.
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git
commit 1cc1e6a00c537fb7f31fb35f9d127e6962a67be9
Author: mck <mc...@apache.org>
AuthorDate: Fri Mar 20 21:36:36 2020 +0100
Improve build so that it can build releases that meet ASF release requirements.
* There's no copyright or NOTICE file in source jar artifact.
* The license is not present in all files (eg AssertUtils.java)
* Source artifacts does not compile. The unreleased test dependency is not used.
* Skip the generation of the assembly source artifact.
* Make `mvn apache-rat:check` work, and pass of the build.
ref:
- https://lists.apache.org/thread.html/r5cdb9b610700dfee473a110632ec5ef3ba322822e4dd658207eba396%40%3Cdev.cassandra.apache.org%3E
- http://www.apache.org/legal/release-policy.html
- http://www.apache.org/dev/release-publishing.html
- https://cwiki.apache.org/confluence/display/INCUBATOR/ReleaseChecklist
---
NOTICE.txt | 11 ++++++
pom.xml | 44 +++++++++++-----------
.../cassandra/distributed/shared/AssertUtils.java | 18 +++++++++
3 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 0000000..a9c0837
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,11 @@
+
+Apache Cassandra In JVM Test API
+Copyright 2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains 'SLF4J', a simple logging
+facade for Java, which can be obtained at (http://www.slf4j.org/)
+ MIT License https://github.com/qos-ch/slf4j/blob/master/LICENSE.txt
+ Copyright (c) 2004-2017 QOS.ch
diff --git a/pom.xml b/pom.xml
index 61fe4b8..c75a916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <assembly.skipAssembly>true</assembly.skipAssembly>
</properties>
<licenses>
@@ -31,20 +32,22 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>in-jvm-dtest-cassandra-tryout</artifactId>
- <version>0.0.1-2.2-1</version>
- <scope>test</scope>
- </dependency>
</dependencies>
+
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>README.md</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -55,8 +58,6 @@
<target>1.8</target>
</configuration>
</plugin>
-
-
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
@@ -70,22 +71,22 @@
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
+ <configuration>
+ <addLicenseHeaders>true</addLicenseHeaders>
+ </configuration>
<executions>
<execution>
- <id>sign-artifacts</id>
<phase>verify</phase>
<goals>
- <goal>sign</goal>
+ <goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
@@ -93,7 +94,6 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git</url>
- <tag>0.0.4</tag>
</scm>
</project>
diff --git a/src/main/java/org/apache/cassandra/distributed/shared/AssertUtils.java b/src/main/java/org/apache/cassandra/distributed/shared/AssertUtils.java
index f914e90..24c37d4 100644
--- a/src/main/java/org/apache/cassandra/distributed/shared/AssertUtils.java
+++ b/src/main/java/org/apache/cassandra/distributed/shared/AssertUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.cassandra.distributed.shared;
import java.util.ArrayList;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-in-jvm-dtest-api] 03/03: Add gitignore file
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git
commit 5e9bd71fe1f455cbb7d7bbc5542fdb136d1f7df4
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Sat Mar 21 11:32:48 2020 +0100
Add gitignore file
---
.gitignore | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..41a9edb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,81 @@
+.gitignore
+
+# C*
+build/
+src/gen-java/
+src/resources/org/apache/cassandra/config/
+logs/
+data/
+conf/hotspot_compiler
+doc/cql3/CQL.html
+
+# C* debs
+build-stamp
+build.properties
+debian/cassandra*debhelper*
+debian/cassandra*.substvars
+debian/cassandra/
+debian/cassandra-tools/
+debian/files
+
+# gitignore doesn't help with modified files - you may wish to:
+# git update-index --assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+# to undo:
+# git update-index --no-assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+
+# IntelliJ
+.idea/
+*.eml
+*.iml
+*.ipr
+*.iws
+
+# Eclipse
+.classpath
+.project
+.metadata
+.settings/
+local.properties
+
+# Cscope
+cscope.*
+
+# NetBeans
+nbbuild/
+nbdist/
+ide/nbproject/private
+nb-configuration.xml
+nbactions.xml
+
+# Maven, etc.
+out/
+target/
+
+# General
+*.pyc
+*~
+*.bak
+*.sw[o,p]
+*.tmp
+.DS_Store
+Thumbs.db
+
+# JSR223
+lib/jsr223/clojure/*.jar
+lib/jsr223/groovy/*.jar
+lib/jsr223/jaskell/*.jar
+lib/jsr223/jruby/*.jar
+lib/jsr223/jruby/jni
+lib/jsr223/jruby/ruby
+lib/jsr223/jython/*.jar
+lib/jsr223/jython/cachedir
+lib/jsr223/scala/*.jar
+
+/.ant-targets-build.xml
+
+# Generated files from the documentation
+doc/source/configuration/cassandra_config_file.rst
+doc/source/tools/nodetool
+
+# Python virtual environment
+venv/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-in-jvm-dtest-api] 02/03: Add licenses header to pom file
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-in-jvm-dtest-api.git
commit 23a786ac6782fc979dde27702e2fc7b07d1147b1
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Sat Mar 21 11:32:22 2020 +0100
Add licenses header to pom file
---
pom.xml | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c75a916..0e6cc3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ https://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -9,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cassandra</groupId>
<artifactId>dtest-api</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<name>In JVM Test API</name>
<description>In JVM Test API</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org