Skip to content

Commit

Permalink
Merge pull request #3 from contentstack/development
Browse files Browse the repository at this point in the history 
Environment bug fixes
  • Loading branch information
@ishaileshmishra
ishaileshmishra authored Mar 18, 2019
2 parents bf50aee + 4916cb8 commit e2f8059
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 137 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ hs_err_pid*
.DS_Store
.DS_Store?

# Compiled source #

# Compiled source files #
*.iml
/target/
/out/
/profiles.xml/
*.class
out/
build/
Expand Down
13 changes: 3 additions & 10 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
## Changelog

------------------------------------------------

### Date: 14-Mar-2019
#### v1.2.1 Bug Fixes and code clean up:
------------------------------------------------
### Date: 20-Feb-2019
#### Maven integration
#### Folder structure modified.

------------------------------------------------

### Date: 15-Dec-2017
#### v1.2.0 New Features:

- Entry- added method ‘addParam’
- Query- added method 'addParam'
- Asset- added method 'addParam'

------------------------------------------------

### Date: 10-Nov-2017
#### v1.1.0 New Features:
- Stack- added method 'ImageTransform'
- Query- added method 'includeContentType'
- QueryResult- added method 'contentType'

------------------------------------------------

#### API deprecation:
- Query
- Deprecated method 'includeSchema'

------------------------------------------------
233 changes: 107 additions & 126 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,16 @@
<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>

<groupId>com.contentstack.sdk</groupId>
<artifactId>java</artifactId>
<version>1.2.0</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<version>1.2.1-SNAPSHOT</version>
<packaging>jar</packaging>


<name>contentstack-java</name>
<description>Java SDK for Contentstack Content Delivery API, Contentstack is a headless CMS with an API-first approach</description>
<url>http://www.contentstack.com/</url>

<url>https://github.com/contentstack/contentstack-java/</url>

<licenses>
<license>
Expand All @@ -35,23 +20,35 @@
</license>
</licenses>


<scm>
<connection>scm:git:git://github.com/contentstack/contentstack-java.git</connection>
<developerConnection>scm:git:ssh://github.com/contentstack/contentstack-java.git</developerConnection>
<url>https://github.com/contentstack/contentstack-java</url>
</scm>

<developers>
<developer>
<name>contentstack</name>
<email>mobile@contentstack.com</email>
<organization>contentstack</organization>
<name>Shailesh Mishra</name>
<email>mshaileshr@gmail.com</email>
<organization>Contentstack</organization>
<organizationUrl>https://www.contentstack.com/</organizationUrl>
</developer>
</developers>


<scm>
<url>https://github.com/contentstack/contentstack-java/tree/master</url>
<connection>scm:git:git://github.com/contentstack/contentstack-java.git</connection>
<developerConnection>scm:git:ssh://github.com:contentstack/contentstack-java.git</developerConnection>
<tag>v@{project.version}</tag>
</scm>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/contentstack/contentstack-java/issues</url>
</issueManagement>


<organization>
<name>Contentstack</name>
<url>https://www.contentstack.com</url>
</organization>


<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
Expand All @@ -64,121 +61,105 @@
</distributionManagement>


<repositories>
<repository>
<id>contentstack</id>
<name>contentstack</name>
<url>http://www.contentstack.com</url>
</repository>
<repository>
<id>contentstack-java</id>
<name>contentstack-java</name>
<url>https://github.com/contentstack/contentstack-java</url>
</repository>
</repositories>


<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>


<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20131018</version>
<version>20090211</version>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
<goals>deploy</goals>
</configuration>
</plugin>
</plugins>
</build>

</project>
28 changes: 28 additions & 0 deletions profiles.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
<profiles>
<profile>
<id>77b9c8fd28426a</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
</profile>

<profile>
<id>ossrh</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.executable>gpg2</gpg.executable>
<gpg.passphrase>***REMOVED***7dQWppvR6UY4</gpg.passphrase>
</properties>
</profile>

</profiles>
</profilesXml>

0 comments on commit e2f8059

Please sign in to comment.