Skip to content

Commit e2f8059

Browse files
ishaileshmishraishaileshmishra
authored
Merge pull request #3 from contentstack/development
Environment bug fixes
2 parents bf50aee + 4916cb8 commit e2f8059

File tree

4 files changed

+141
-137
lines changed

4 files changed

+141
-137
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ hs_err_pid*
1010
.DS_Store
1111
.DS_Store?
1212

13-
# Compiled source #
13+
14+
# Compiled source files #
1415
*.iml
1516
/target/
1617
/out/
18+
/profiles.xml/
1719
*.class
1820
out/
1921
build/

‎CHANGELOG.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
## Changelog
2-
32
------------------------------------------------
4-
3+
### Date: 14-Mar-2019
4+
#### v1.2.1 Bug Fixes and code clean up:
5+
------------------------------------------------
56
### Date: 20-Feb-2019
67
#### Maven integration
78
#### Folder structure modified.
8-
99
------------------------------------------------
10-
1110
### Date: 15-Dec-2017
1211
#### v1.2.0 New Features:
13-
1412
- Entry- added method ‘addParam’
1513
- Query- added method 'addParam'
1614
- Asset- added method 'addParam'
17-
1815
------------------------------------------------
19-
2016
### Date: 10-Nov-2017
2117
#### v1.1.0 New Features:
2218
- Stack- added method 'ImageTransform'
2319
- Query- added method 'includeContentType'
2420
- QueryResult- added method 'contentType'
25-
2621
------------------------------------------------
27-
2822
#### API deprecation:
2923
- Query
3024
- Deprecated method 'includeSchema'
31-
3225
------------------------------------------------

‎pom.xml

Lines changed: 107 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
65
<modelVersion>4.0.0</modelVersion>
6+
77
<groupId>com.contentstack.sdk</groupId>
88
<artifactId>java</artifactId>
9-
<version>1.2.0</version>
10-
<build>
11-
<plugins>
12-
<plugin>
13-
<groupId>org.apache.maven.plugins</groupId>
14-
<artifactId>maven-compiler-plugin</artifactId>
15-
<version>2.3.2</version>
16-
<configuration>
17-
<source>8</source>
18-
<target>8</target>
19-
</configuration>
20-
</plugin>
21-
</plugins>
22-
</build>
9+
<version>1.2.1-SNAPSHOT</version>
2310
<packaging>jar</packaging>
2411

25-
2612
<name>contentstack-java</name>
2713
<description>Java SDK for Contentstack Content Delivery API, Contentstack is a headless CMS with an API-first approach</description>
28-
<url>http://www.contentstack.com/</url>
29-
14+
<url>https://github.com/contentstack/contentstack-java/</url>
3015

3116
<licenses>
3217
<license>
@@ -35,23 +20,35 @@
3520
</license>
3621
</licenses>
3722

38-
39-
<scm>
40-
<connection>scm:git:git://github.com/contentstack/contentstack-java.git</connection>
41-
<developerConnection>scm:git:ssh://github.com/contentstack/contentstack-java.git</developerConnection>
42-
<url>https://github.com/contentstack/contentstack-java</url>
43-
</scm>
44-
4523
<developers>
4624
<developer>
47-
<name>contentstack</name>
48-
<email>mobile@contentstack.com</email>
49-
<organization>contentstack</organization>
25+
<name>Shailesh Mishra</name>
26+
<email>mshaileshr@gmail.com</email>
27+
<organization>Contentstack</organization>
5028
<organizationUrl>https://www.contentstack.com/</organizationUrl>
5129
</developer>
5230
</developers>
5331

5432

33+
<scm>
34+
<url>https://github.com/contentstack/contentstack-java/tree/master</url>
35+
<connection>scm:git:git://github.com/contentstack/contentstack-java.git</connection>
36+
<developerConnection>scm:git:ssh://github.com:contentstack/contentstack-java.git</developerConnection>
37+
<tag>v@{project.version}</tag>
38+
</scm>
39+
40+
<issueManagement>
41+
<system>GitHub Issues</system>
42+
<url>https://github.com/contentstack/contentstack-java/issues</url>
43+
</issueManagement>
44+
45+
46+
<organization>
47+
<name>Contentstack</name>
48+
<url>https://www.contentstack.com</url>
49+
</organization>
50+
51+
5552
<distributionManagement>
5653
<snapshotRepository>
5754
<id>ossrh</id>
@@ -64,121 +61,105 @@
6461
</distributionManagement>
6562

6663

67-
<repositories>
68-
<repository>
69-
<id>contentstack</id>
70-
<name>contentstack</name>
71-
<url>http://www.contentstack.com</url>
72-
</repository>
73-
<repository>
74-
<id>contentstack-java</id>
75-
<name>contentstack-java</name>
76-
<url>https://github.com/contentstack/contentstack-java</url>
77-
</repository>
78-
</repositories>
79-
80-
8164
<properties>
8265
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8366
</properties>
8467

8568

86-
<profiles>
87-
<profile>
88-
<id>release</id>
89-
<build>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-source-plugin</artifactId>
94-
<version>2.2.1</version>
95-
<executions>
96-
<execution>
97-
<id>attach-sources</id>
98-
<goals>
99-
<goal>jar-no-fork</goal>
100-
</goals>
101-
</execution>
102-
</executions>
103-
</plugin>
104-
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
106-
<artifactId>maven-javadoc-plugin</artifactId>
107-
<version>2.9.1</version>
108-
<executions>
109-
<execution>
110-
<id>attach-javadocs</id>
111-
<goals>
112-
<goal>jar</goal>
113-
</goals>
114-
</execution>
115-
</executions>
116-
</plugin>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-gpg-plugin</artifactId>
120-
<version>1.5</version>
121-
<executions>
122-
<execution>
123-
<id>sign-artifacts</id>
124-
<phase>verify</phase>
125-
<goals>
126-
<goal>sign</goal>
127-
</goals>
128-
</execution>
129-
</executions>
130-
</plugin>
131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-compiler-plugin</artifactId>
134-
<version>3.6.1</version>
135-
<configuration>
136-
<source>8</source>
137-
<target>8</target>
138-
</configuration>
139-
</plugin>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-release-plugin</artifactId>
143-
<version>2.5.3</version>
144-
<configuration>
145-
<autoVersionSubmodules>true</autoVersionSubmodules>
146-
<useReleaseProfile>false</useReleaseProfile>
147-
<releaseProfiles>release</releaseProfiles>
148-
<goals>deploy</goals>
149-
</configuration>
150-
</plugin>
151-
152-
<plugin>
153-
<groupId>org.sonatype.plugins</groupId>
154-
<artifactId>nexus-staging-maven-plugin</artifactId>
155-
<version>1.6.8</version>
156-
<extensions>true</extensions>
157-
<configuration>
158-
<serverId>ossrh</serverId>
159-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
160-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
161-
</configuration>
162-
</plugin>
163-
</plugins>
164-
</build>
165-
</profile>
166-
</profiles>
167-
16869
<dependencies>
169-
17070
<dependency>
17171
<groupId>junit</groupId>
17272
<artifactId>junit</artifactId>
17373
<version>4.12</version>
17474
<scope>test</scope>
17575
</dependency>
76+
17677
<dependency>
17778
<groupId>org.json</groupId>
17879
<artifactId>json</artifactId>
179-
<version>20131018</version>
80+
<version>20090211</version>
18081
</dependency>
18182

18283
</dependencies>
18384

85+
<build>
86+
<plugins>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-source-plugin</artifactId>
90+
<version>2.2.1</version>
91+
<executions>
92+
<execution>
93+
<id>attach-sources</id>
94+
<goals>
95+
<goal>jar-no-fork</goal>
96+
</goals>
97+
</execution>
98+
</executions>
99+
</plugin>
100+
<plugin>
101+
<groupId>org.apache.maven.plugins</groupId>
102+
<artifactId>maven-javadoc-plugin</artifactId>
103+
<version>2.9.1</version>
104+
<executions>
105+
<execution>
106+
<id>attach-javadocs</id>
107+
<goals>
108+
<goal>jar</goal>
109+
</goals>
110+
</execution>
111+
</executions>
112+
</plugin>
113+
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-gpg-plugin</artifactId>
117+
<version>1.5</version>
118+
<executions>
119+
<execution>
120+
<id>sign-artifacts</id>
121+
<phase>verify</phase>
122+
<goals>
123+
<goal>sign</goal>
124+
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-compiler-plugin</artifactId>
132+
<version>3.8.0</version>
133+
<configuration>
134+
<source>8</source>
135+
<target>8</target>
136+
</configuration>
137+
</plugin>
138+
139+
<plugin>
140+
<groupId>org.sonatype.plugins</groupId>
141+
<artifactId>nexus-staging-maven-plugin</artifactId>
142+
<version>1.6.7</version>
143+
<extensions>true</extensions>
144+
<configuration>
145+
<serverId>ossrh</serverId>
146+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
147+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
148+
</configuration>
149+
</plugin>
150+
151+
<plugin>
152+
<groupId>org.apache.maven.plugins</groupId>
153+
<artifactId>maven-release-plugin</artifactId>
154+
<version>2.5.3</version>
155+
<configuration>
156+
<autoVersionSubmodules>true</autoVersionSubmodules>
157+
<useReleaseProfile>false</useReleaseProfile>
158+
<releaseProfiles>release</releaseProfiles>
159+
<goals>deploy</goals>
160+
</configuration>
161+
</plugin>
162+
</plugins>
163+
</build>
164+
184165
</project>

‎profiles.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<profilesXml xmlns="http://maven.apache.org/PROFILES/1.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/PROFILES/1.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd">
5+
<profiles>
6+
<profile>
7+
<id>77b9c8fd28426a</id>
8+
<activation>
9+
<property>
10+
<name>performRelease</name>
11+
<value>true</value>
12+
</property>
13+
</activation>
14+
</profile>
15+
16+
<profile>
17+
<id>ossrh</id>
18+
<activation>
19+
<activeByDefault>true</activeByDefault>
20+
</activation>
21+
<properties>
22+
<gpg.executable>gpg2</gpg.executable>
23+
<gpg.passphrase>***REMOVED***7dQWppvR6UY4</gpg.passphrase>
24+
</properties>
25+
</profile>
26+
27+
</profiles>
28+
</profilesXml>

0 commit comments

Comments
 (0)