Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/lib/
target/
output/
build/cli/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ script:
- wget https://github.com/CloudSlang/cloud-slang/releases/download/cloudslang-1.0.9/cslang-builder.zip
- unzip -q cslang-builder.zip
- chmod +x cslang-builder/bin/cslang-builder
- ./cslang-builder/bin/cslang-builder -cr src/main/slang -pr src -ts src/test/slang -ts \!default,couchbase -cov -des -cs
- ./cslang-builder/bin/cslang-builder -cr src/main/library -pr src -ts src/test/library -ts \!default,couchbase -cov -des -cs

after_success:
- java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter --projectToken ${codacyToken} -l Java -r cobertura.xml
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# io.cloudslang.content:cs-couchbase v0.1.1-SNAPSHOT git changelog


**cs-couchbase-0.1.1-RC17**
**cs-couchbase-0.1.1-RC16**
2017-11-08 09:10:06 +0200 POM.xml cleanup (moldovso)

**cs-couchbase-0.1.1-RC15**
**cs-couchbase-0.1.1-RC14**
**cs-couchbase-0.1.1-RC13**
2017-11-07 16:36:52 +0200 Double sources fix (moldovso)

**cs-couchbase-0.1.1-RC12**
**cs-couchbase-0.1.1-RC11**
2017-11-07 16:27:34 +0200 Added internal release profile (moldovso)

**cs-couchbase-0.1.1-RC8**
**cs-couchbase-0.1.1-RC7**
**cs-couchbase-0.1.1-RC6**
**cs-couchbase-0.1.1-RC4**
**cs-couchbase-0.1.1-RC3**
**cs-couchbase-0.1.1-RC2**
**cs-couchbase-0.1.1-RC1**
2017-10-26 20:53:50 +0300 Temporary gitlog plugin disable (moldovso)
2017-10-26 02:39:55 +0300 Update logic in pom file (Sorin Moldovan)
2017-10-24 16:14:14 +0300 Test webhooks (moldovso)
2017-10-24 16:06:56 +0300 Update packages to latest version available. (moldovso)
2017-10-24 15:08:26 +0300 Implement automatic dependency analyzer (moldovso)
Expand Down
75 changes: 50 additions & 25 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?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">
<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">

<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -188,8 +190,8 @@
<includeEmptyDirs>false</includeEmptyDirs>
<resources>
<resource>
<targetPath>slang</targetPath>
<directory>/src/main/slang</directory>
<targetPath>../library</targetPath>
<directory>/src/main/library</directory>
<filtering>false</filtering>
</resource>
</resources>
Expand Down Expand Up @@ -250,28 +252,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.danielflower.mavenplugins</groupId>
<artifactId>gitlog-maven-plugin</artifactId>
<version>1.13.3</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>${project.basedir}</outputDirectory>
<fullGitMessage>false</fullGitMessage>
<issueManagementUrl>https://github.com/CloudSlang/cs-couchbase/issues</issueManagementUrl>
<generatePlainTextChangeLog>false</generatePlainTextChangeLog>
<generateSimpleHTMLChangeLog>false</generateSimpleHTMLChangeLog>
<generateJSONChangeLog>false</generateJSONChangeLog>
<generateMarkdownChangeLog>true</generateMarkdownChangeLog>
<markdownChangeLogFilename>CHANGELOG.md</markdownChangeLogFilename>
</configuration>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -300,6 +280,51 @@
</plugins>
</build>
</profile>
<profile>
<id>deploy-cp</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<copyPom>true</copyPom>
<useRepositoryLayout>true</useRepositoryLayout>
<excludeTransitive>false</excludeTransitive>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>dist</id>
<phase>prepare-package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src${file.separator}main${file.separator}resources${file.separator}package.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
</profile>
</profiles>

</project>
43 changes: 43 additions & 0 deletions src/main/resources/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>cp-${project.version}</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>target/library</directory>
<includes>
<include>**/*</include>
</includes>
<outputDirectory>Content/Library</outputDirectory>
</fileSet>
<fileSet>
<directory>target/lib</directory>
<includes>
<include>**/*</include>
</includes>
<outputDirectory>Lib</outputDirectory>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/*.xml</exclude>
</excludes>
<outputDirectory>Actions</outputDirectory>
</fileSet>
<fileSet>
<directory>target/classes</directory>
<includes>
<include>**/pom.xml</include>
</includes>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
18 changes: 18 additions & 0 deletions src/main/resources/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?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">

<modelVersion>4.0.0</modelVersion>
<artifactId>cs-dependencies</artifactId>
<version>0.0.1-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>io.cloudslang.content</groupId>
<artifactId>cs-base</artifactId>
<version>1.0.3</version>
</dependency>
</dependencies>

</project>