Skip to content
This repository was archived by the owner on May 29, 2025. It is now read-only.

EMO-7628 add maven enforcer plugin #18

Merged
merged 4 commits into from
Mar 28, 2021
Merged

EMO-7628 add maven enforcer plugin #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5a3400
initial
mike-unitskyi Mar 19, 2021
7c8da7f
working
mike-unitskyi Mar 23, 2021
65e0bab
fix logging
mike-unitskyi Mar 26, 2021
877effa
bump java version
mike-unitskyi Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: java
notifications:
email: false
jdk: openjdk7
jdk: openjdk8
441 changes: 277 additions & 164 deletions pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/it/smoke/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ under the License.
<configuration>
<loadAfterFirstStart>false</loadAfterFirstStart>
<cuLoadAfterFirstStart>false</cuLoadAfterFirstStart>
<startNativeTransport>true</startNativeTransport>
<rpcPort>${cassandraPort}</rpcPort>
<storagePort>${cassandra.storagePort}</storagePort>
<stopPort>${cassandra.stopPort}</stopPort>
Expand Down
1 change: 1 addition & 0 deletions src/it/spaces in path/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ under the License.
</executions>
<configuration>
<loadAfterFirstStart>false</loadAfterFirstStart>
<startNativeTransport>true</startNativeTransport>
<rpcPort>${cassandraPort}</rpcPort>
<storagePort>${cassandra.storagePort}</storagePort>
<stopPort>${cassandra.stopPort}</stopPort>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/codehaus/mojo/cassandra/AbstractCqlExecMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.IOUtil;

Expand All @@ -30,7 +30,7 @@ public abstract class AbstractCqlExecMojo extends AbstractCassandraMojo
* @parameter expression="${cql.version}"
* @since 1.2.1-2
*/
private String cqlVersion = "2.0.0";
private String cqlVersion = "3.4.0";

protected String readFile(File file) throws MojoExecutionException
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/mojo/cassandra/DropColumnFamiliesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import org.apache.cassandra.thrift.SchemaDisagreementException;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.thrift.Cassandra.Client;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.thrift.TException;

/**
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/org/codehaus/mojo/cassandra/ThriftApiOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package org.codehaus.mojo.cassandra;

import org.apache.cassandra.thrift.Cassandra;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.thrift.SchemaDisagreementException;
import org.apache.thrift.TException;

public abstract class ThriftApiOperation {

private String keyspace;
private final String rpcAddress;
private final int rpcPort;
private String cqlVersion = "2.0.0";
private String cqlVersion = "3.4.0";

public ThriftApiOperation(String rpcAddress, int rpcPort)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/mojo/cassandra/smart/SmartCqlExecCassandraMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.CqlRow;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.mojo.cassandra.AbstractCassandraMojo;
Expand Down