Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
support transferring/compiling source files in a different location t…
Browse files Browse the repository at this point in the history
…han cclsource. (#38)
  • Loading branch information
feckertson authored Jan 17, 2020
1 parent 78f50d1 commit e62f1f8
Show file tree
Hide file tree
Showing 42 changed files with 311 additions and 142 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
# ccl-testing Change Log

## 2020-01-17
* ccl-maven-plugin **3.3**
* cerreal-maven-plugin **2.2**

### Corrections
* Fix [#30](https://github.com/cerner/ccl-testing/issues/30) credentials prompt displayed if gss-api-authentication enabled.
* Fix [#23](https://github.com/cerner/ccl-testing/issues/23) skip processing configurations not working.

### Enhancements
* Add support for SSH public key authentication.
* Allow source code to be transferred to a location other than $CCLSOURCE
* Allow passed test cases, tests and/or asserts to be hidden in the cerreal report.

### Miscellaneous
* Update dependencies for all components.

## 2019-02-18
* whitenoise-maven-plugin **2.5**
* cclunit-archetype **1.5**
Expand Down Expand Up @@ -50,7 +58,7 @@
* Fixed the integration tests to honor the configured osPromptPattern.
* Fixed cdoc to not bomb on record structure definions which continue at the same level where an include file left off.

### Miscelaneous
### Miscellaneous
* Fail a script file upload if the file name is not lower case or the created object name does not match the file name.
- The whitenoise and cerreal reports are inaccurate in those situations.
* Changed the default osPromptPattern to `user:enviroment@host:[^\r\n]*(\r|\n)+#\s*`
Expand Down Expand Up @@ -111,7 +119,7 @@ which then got expanded to the last argument of the last command.
* Addressed all findbugs issues and compiler warnings.
* Fixed an issue where a record structure date field having a zero value would cause an exception to be thrown.

### Miscelaneous
### Miscellaneous
* Changed `maven-X-plugin` to `X-maven-plugin` for each maven plugin to satisfy [maven3 restrictions on plugin naming][plugin-naming].
* Added additional ccl-maven-plugin output to help identify the source of the problem when it has build failures.
* Changed the names of some ccl-maven-plugin settings and adopted a uniform naming convention for the associated property.
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ The latest released versions of the ccl-testing components are listed below.
Visit individuals components for details and usage instructions.
Visit the [change log](CHANGELOG.md) for version details.

* [**ccl-maven-plugin (3.2)**][ccl-maven-plugin] - Maven plugin for transferring resources, compiling CCL code and tests, executing the
* [**ccl-maven-plugin (3.3)**][ccl-maven-plugin] - Maven plugin for transferring resources, compiling CCL code and tests, executing the
tests, and retrieving the test and coverage results.
* [**cerreal-maven-plugin (2.1)**](cerreal-maven-plugin/README.md) - Maven reporting plugin to report test and coverage results.
* [**whitenoise-maven-plugin (2.5)**](whitenoise/whitenoise-maven-plugin/README.md) - Maven reporting plugin that identifies common CCL coding errors.
* [**cdoc-maven-plugin (1.2)**](cdoc/cdoc-maven-plugin/README.md) - Maven reporting plugin that generates code documentation from code comments.
* [**cerreal-maven-plugin (2.2)**](cerreal-maven-plugin/README.md) - Maven reporting plugin to report test and coverage results.
* [**whitenoise-maven-plugin (2.6)**](whitenoise/whitenoise-maven-plugin/README.md) - Maven reporting plugin that identifies common CCL coding errors.
* [**cdoc-maven-plugin (1.3)**](cdoc/cdoc-maven-plugin/README.md) - Maven reporting plugin that generates code documentation from code comments.
* [**ecosystem**](ecosystem/README.md) - Eclipse preferences to ensure consistent formating and compiler settings. Import with [Workspace Mechanic][workspace_mechanic].
* [**ftp-util (2.0)**](ftp-util/README.md) - ccl-maven-plugin dependency used to ftp resource to/from the Cerner Millennium back end.
* [**j4ccl (3.1)**](j4ccl/README.md) - ccl-maven-plugin dependency defining classes and interfaces for accessing a Cerner Millennium back end.
* [**j4ccl-ssh (4.2)**](j4ccl-ssh/README.md) - ccl-maven-plugin dependency leveraging JCraft SSH to implement the j4ccl interfaces.
* [**jsch-util (2.0.0)**](jsch-util/README.md) - ccl-maven-plugin dependency leveraging JCraft to provide back-end connections for j4ccl-ssh.
* [**cclunit-archetype (1.5)**][archetype usage] - archetype to generate a skeleton CCL project using the latest plugins.
* [**cclunit-maven-settings-check-archetype (1.2)**][archetype usage] - archetype to generate a CCL project to check maven settings.
* [**ftp-util (2.1)**](ftp-util/README.md) - ccl-maven-plugin dependency used to ftp resource to/from the Cerner Millennium back end.
* [**j4ccl (3.2)**](j4ccl/README.md) - ccl-maven-plugin dependency defining classes and interfaces for accessing a Cerner Millennium back end.
* [**j4ccl-ssh (4.3)**](j4ccl-ssh/README.md) - ccl-maven-plugin dependency leveraging JCraft SSH to implement the j4ccl interfaces.
* [**jsch-util (2.1)**](jsch-util/README.md) - ccl-maven-plugin dependency leveraging JCraft to provide back-end connections for j4ccl-ssh.
* [**cclunit-archetype (1.6)**][archetype usage] - archetype to generate a skeleton CCL project using the latest plugins.
* [**cclunit-maven-settings-check-archetype (1.3)**][archetype usage] - archetype to generate a CCL project to check maven settings.

## Quick Start Guide
If you are new to CCL Unit testing and want to get started writing and running tests quickly, [look here][ccl_unit_usage].
Expand Down
4 changes: 2 additions & 2 deletions archetype/cclunit-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>com.cerner.ccl</groupId>
<artifactId>ccltesting-parent-pom</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<relativePath>../../parent-pom</relativePath>
</parent>
<groupId>com.cerner.ccl.archetype</groupId>
<artifactId>cclunit-archetype</artifactId>
<version>1.6-SNAPSHOT</version>
<version>1.7-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<scm>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>ccl-maven-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
<extensions>true</extensions>
<configuration>
<logFile>${project.build.directory}/output.log</logFile>
Expand Down Expand Up @@ -80,17 +80,17 @@
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>cerreal-maven-plugin</artifactId>
<version>2.1</version>
<version>2.2</version>
</plugin>
<plugin>
<groupId>com.cerner.ccl.whitenoise</groupId>
<artifactId>whitenoise-maven-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
4 changes: 2 additions & 2 deletions archetype/cclunit-maven-settings-check-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>com.cerner.ccl</groupId>
<artifactId>ccltesting-parent-pom</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<relativePath>../../parent-pom</relativePath>
</parent>
<groupId>com.cerner.ccl.archetype</groupId>
<artifactId>cclunit-maven-settings-check-archetype</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>cclunit-maven-settings-check-archetype</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>ccl-maven-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
<extensions>true</extensions>
<configuration>
<logFile>${project.build.directory}/output.log</logFile>
Expand Down
2 changes: 1 addition & 1 deletion ccl-maven-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Here is the plugin specification.
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>ccl-maven-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
<extensions>true</extensions>
</plugin>
```
Expand Down
6 changes: 6 additions & 0 deletions ccl-maven-plugin/doc/CONFIGURATIONOPTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ CCL test cases do not fail fast, but if set to true, the maven build will fail f
- default:
- `true`

## cclsource
- (string) Either the full path or a logical specifying the backend directory to which source files will be transferred. Useful only for compiling at this time.
Additional work is needed to relax the requirement that unit tests reside in $CCLSOURCE.
- since 3.3
- default: $CCLSOURCE

## specifyDebugCcl
- (true/false) Causes the plugin to use the new CCL executable cclora_dbg rather than the the original CCL executable cclora which has been
modified to no longer produce debug or code coverage data. If the target domain does not yet have the cclora_dbg executable, then the plugin will
Expand Down
10 changes: 5 additions & 5 deletions ccl-maven-plugin/doc/SAMPLEPOM.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>ccl-maven-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
<extensions>true</extensions>
<configuration>
<logFile>${project.build.directory}/output.log</logFile>
Expand Down Expand Up @@ -81,17 +81,17 @@
<plugin>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>cerreal-maven-plugin</artifactId>
<version>2.1</version>
<version>2.2</version>
</plugin>
<plugin>
<groupId>com.cerner.ccl.whitenoise</groupId>
<artifactId>whitenoise-maven-plugin</artifactId>
<version>2.5</version>
<version>2.6</version>
</plugin>
<plugin>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>3.8.2</version>
</plugin>
</plugins>
</reporting>
Expand Down
10 changes: 5 additions & 5 deletions ccl-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<parent>
<groupId>com.cerner.ccl</groupId>
<artifactId>ccltesting-parent-pom</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<groupId>com.cerner.ccl.testing</groupId>
<artifactId>ccl-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>3.3-SNAPSHOT</version>
<version>3.4-SNAPSHOT</version>
<name>CCL Maven Plugin</name>
<description>A Maven plugin used to compile and test CCL code.</description>
<properties>
<plugin.api.version>3.6.2</plugin.api.version>
<plugin.api.version>3.6.3</plugin.api.version>
<plugin.api-tools.version>3.6.0</plugin.api-tools.version>
</properties>
<scm>
Expand Down Expand Up @@ -163,12 +163,12 @@
<dependency>
<groupId>com.cerner.ccl.comm</groupId>
<artifactId>j4ccl</artifactId>
<version>3.2-SNAPSHOT</version>
<version>3.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.cerner.ccl.comm</groupId>
<artifactId>j4ccl-ssh</artifactId>
<version>4.3-SNAPSHOT</version>
<version>4.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
27 changes: 27 additions & 0 deletions ccl-maven-plugin/src/changes/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,33 @@
<title>ccl-maven-plugin Changes Report</title>
</properties>
<body>
<release version="3.3" date="2020-01-17">
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Support SSH public key authentication.
</action>
<action dev="fred eckertson" issue="" type="fix" system="JIRA">
Skip kerberos authentication and use username/password authentication.
</action>
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Support transerring source files to a different location than $CCLSOURCE.
</action>
</release>
<release version="3.2" date="2019-02-16">
<action dev="fred eckertson" issue="" type="fix" system="JIRA">
Correct issue in the regex used to ensure the name of a program file matches the compiled object name.
</action>
</release>
<release version="3.1" date="2019-02-11">
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Fail early if a source file name is not all lower case.
</action>
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Fail early if a program source file name does not match the compiled object name.
</action>
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Change the default osPromptPattern.
</action>
</release>
<release version="3.0" date="2018-07-04">
<action dev="fred eckertson" issue="" type="add" system="JIRA">
Upgrade j4ccl-ssh to version 4.0 providing Linux support, skipping CCL login when compiling scripts and optionally skipping envset.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ public abstract class BaseCclMojo extends AbstractMojo {
@Parameter(property = "ccl-environment", required = true)
protected String environment;

/**
* A logical or the full path to the back-end directory to which source files will be transferred. The host user
* must have read/write access to the directory. Defaults to $CCLSOURCE.
*
*
* @since 3.3
*/
@Parameter(property = "ccl-cclsource", required = false)
protected String cclsourcePath;

/**
* The DNS name or IP address of the remote server on which the goals of this plugin will be executed.
*
Expand Down Expand Up @@ -320,6 +330,9 @@ protected void addBackendInformation(final Subject subject) throws MojoExecution
if (!isEmpty(keyFile)) {
subject.getPrincipals().add(new PrivateKeyPrincipal(keyFile));
}
if (cclsourcePath != null) {
System.setProperty("ccl-cclsource", cclsourcePath);
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions cclunit-framework-schema-xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<parent>
<groupId>com.cerner.ccl</groupId>
<artifactId>ccltesting-parent-pom</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<artifactId>cclunit-framework-schema-xml</artifactId>
<version>2.0</version>
<version>2.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>CCL Testing Framework XML Schemas</name>
<description>Schema files describing the XML used by the CCL Testing Framework</description>
Expand Down
2 changes: 1 addition & 1 deletion cdoc/cdoc-maven-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Usage
<plugin>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
10 changes: 5 additions & 5 deletions cdoc/cdoc-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-maven-plugin</artifactId>
<version>1.3-SNAPSHOT</version>
<version>1.4-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>CDoc Maven Plugin</name>
<description>A plugin used to generate documentation reports about CCL source code</description>
Expand Down Expand Up @@ -53,8 +53,8 @@
<jdk.source.version>1.8</jdk.source.version>
<jdk.target.version>1.8</jdk.target.version>
<powermock.version>2.0.4</powermock.version>
<plugin.api.version>3.6.2</plugin.api.version>
<ccl.maven.plugin.version>3.3-SNAPSHOT</ccl.maven.plugin.version>
<plugin.api.version>3.6.3</plugin.api.version>
<ccl.maven.plugin.version>3.4-SNAPSHOT</ccl.maven.plugin.version>
<surefire.version>3.0.0-M3</surefire.version>
<changes.plugin.version>2.12.1</changes.plugin.version>
</properties>
Expand Down Expand Up @@ -477,7 +477,7 @@
<dependency>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-parser</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -542,7 +542,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-rc-1</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions cdoc/cdoc-parser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.cerner.ccl.cdoc</groupId>
<artifactId>cdoc-parser</artifactId>
<version>2.2-SNAPSHOT</version>
<version>2.3-SNAPSHOT</version>
<name>CDoc Parser</name>
<description>A parser utility for parsing CDoc CCL documentation</description>
<url>https://github.com/cerner/ccl-testing</url>
Expand Down Expand Up @@ -50,7 +50,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<changes.plugin.version>2.12.1</changes.plugin.version>
<powermock.version>2.0.2</powermock.version>
<powermock.version>2.0.4</powermock.version>
<jdk.source.version>1.8</jdk.source.version>
<jdk.target.version>1.8</jdk.target.version>
<surefire.version>3.0.0-M3</surefire.version>
Expand Down Expand Up @@ -445,7 +445,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13-rc-1</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -463,7 +463,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.1.0</version>
<version>3.2.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit e62f1f8

Please sign in to comment.