Skip to content

Commit 4df4b61

Browse files
tallevami-hometallevami-home
committed
Merge Maven preperation by shakiba
2 parents 2edd067 + 8684698 commit 4df4b61

File tree

15 files changed

+198
-69
lines changed

15 files changed

+198
-69
lines changed

‎.classpath‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="tests"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
6-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7-
<classpathentry kind="output" path="target/classes"/>
3+
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
4+
<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
5+
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
6+
<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
7+
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
8+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
9+
<classpathentry kind="output" path="target/classes"/>
810
</classpath>

‎.gitignore‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
bin
2-
lib
3-
target
1+
*.class
2+
3+
# Package Files #
4+
*.jar
5+
*.war
6+
*.ear
7+
8+
.*
9+
target/
10+
test-output/
11+
.settings
412
.classpath
513
.project
6-
.settings

‎.project‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
18+
<buildCommand>
19+
<name>org.maven.ide.eclipse.maven2Builder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
1823
</buildSpec>
1924
<natures>
25+
<nature>org.maven.ide.eclipse.maven2Nature</nature>
2026
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2127
<nature>org.eclipse.jdt.core.javanature</nature>
2228
</natures>

‎pom.xml‎

Lines changed: 174 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,175 @@
1-
<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">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>com.cloudinary</groupId>
4-
<artifactId>cloudinary_java</artifactId>
5-
<version>0.1-SNAPSHOT</version>
6-
<name>Cloudinary Java Client Library</name>
7-
<properties>
8-
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
9-
</properties>
10-
<dependencies>
11-
<dependency>
12-
<groupId>commons-lang</groupId>
13-
<artifactId>commons-lang</artifactId>
14-
<version>2.6</version>
15-
</dependency>
16-
<dependency>
17-
<groupId>commons-codec</groupId>
18-
<artifactId>commons-codec</artifactId>
19-
<version>1.6</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>commons-collections</groupId>
23-
<artifactId>commons-collections</artifactId>
24-
<version>3.2.1</version>
25-
</dependency>
26-
<dependency>
27-
<groupId>commons-logging</groupId>
28-
<artifactId>commons-logging</artifactId>
29-
<version>1.1.1</version>
30-
</dependency>
31-
<dependency>
32-
<groupId>org.apache.httpcomponents</groupId>
33-
<artifactId>httpclient</artifactId>
34-
<version>4.2.1</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.apache.httpcomponents</groupId>
38-
<artifactId>httpmime</artifactId>
39-
<version>4.2.1</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.apache.httpcomponents</groupId>
43-
<artifactId>httpcore</artifactId>
44-
<version>4.2.1</version>
45-
</dependency>
46-
<dependency>
47-
<groupId>com.googlecode.json-simple</groupId>
48-
<artifactId>json-simple</artifactId>
49-
<version>1.1.1</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>junit</groupId>
53-
<artifactId>junit</artifactId>
54-
<version>4.10</version>
55-
</dependency>
56-
</dependencies>
57-
<build>
58-
<sourceDirectory>src</sourceDirectory>
59-
<testSourceDirectory>tests</testSourceDirectory>
60-
</build>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.sonatype.oss</groupId>
7+
<artifactId>oss-parent</artifactId>
8+
<version>7</version>
9+
</parent>
10+
11+
<groupId>com.cloudinary</groupId>
12+
<artifactId>cloudinary</artifactId>
13+
<version>0.1-SNAPSHOT</version>
14+
<packaging>jar</packaging>
15+
<name>Cloudinary Java Client Library</name>
16+
<description></description>
17+
<url>http://github.com/cloudinary/cloudinary_java</url>
18+
19+
<licenses>
20+
<!-- TODO -->
21+
<license>
22+
<name>The Apache Software License, Version 2.0</name>
23+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
27+
28+
<developers>
29+
<developer>
30+
<!-- TODO -->
31+
<id>jsmith</id>
32+
<name>John Smith</name>
33+
<email>john@cloudinary.com</email>
34+
</developer>
35+
</developers>
36+
37+
<scm>
38+
<connection>scm:git:git://github.com/cloudinary/cloudinary_java.git</connection>
39+
<developerConnection>scm:git:git@github.com:cloudinary/cloudinary_java.git</developerConnection>
40+
<url>http://github.com/cloudinary/cloudinary_java</url>
41+
</scm>
42+
43+
<properties>
44+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
46+
</properties>
47+
48+
<build>
49+
<plugins>
50+
<plugin>
51+
<artifactId>maven-compiler-plugin</artifactId>
52+
<configuration>
53+
<source>1.6</source>
54+
<target>1.6</target>
55+
<encoding>UTF-8</encoding>
56+
</configuration>
57+
</plugin>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-source-plugin</artifactId>
61+
<executions>
62+
<execution>
63+
<id>attach-sources</id>
64+
<goals>
65+
<goal>jar</goal>
66+
</goals>
67+
</execution>
68+
</executions>
69+
</plugin>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-javadoc-plugin</artifactId>
73+
<executions>
74+
<execution>
75+
<id>attach-javadocs</id>
76+
<goals>
77+
<goal>jar</goal>
78+
</goals>
79+
</execution>
80+
</executions>
81+
</plugin>
82+
</plugins>
83+
</build>
84+
85+
<dependencies>
86+
<dependency>
87+
<groupId>commons-lang</groupId>
88+
<artifactId>commons-lang</artifactId>
89+
<version>2.6</version>
90+
</dependency>
91+
<dependency>
92+
<groupId>commons-codec</groupId>
93+
<artifactId>commons-codec</artifactId>
94+
<version>1.6</version>
95+
</dependency>
96+
<dependency>
97+
<groupId>commons-collections</groupId>
98+
<artifactId>commons-collections</artifactId>
99+
<version>3.2.1</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>commons-logging</groupId>
103+
<artifactId>commons-logging</artifactId>
104+
<version>1.1.1</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.httpcomponents</groupId>
108+
<artifactId>httpclient</artifactId>
109+
<version>4.2.1</version>
110+
</dependency>
111+
<dependency>
112+
<groupId>org.apache.httpcomponents</groupId>
113+
<artifactId>httpmime</artifactId>
114+
<version>4.2.1</version>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.apache.httpcomponents</groupId>
118+
<artifactId>httpcore</artifactId>
119+
<version>4.2.1</version>
120+
</dependency>
121+
<dependency>
122+
<groupId>com.googlecode.json-simple</groupId>
123+
<artifactId>json-simple</artifactId>
124+
<version>1.1.1</version>
125+
</dependency>
126+
<dependency>
127+
<groupId>junit</groupId>
128+
<artifactId>junit</artifactId>
129+
<version>4.10</version>
130+
</dependency>
131+
</dependencies>
132+
133+
<profiles>
134+
<profile>
135+
<id>release-sign-artifacts</id>
136+
<activation>
137+
<property>
138+
<name>performRelease</name>
139+
<value>true</value>
140+
</property>
141+
</activation>
142+
<build>
143+
<plugins>
144+
<plugin>
145+
<groupId>org.apache.maven.plugins</groupId>
146+
<artifactId>maven-gpg-plugin</artifactId>
147+
<executions>
148+
<execution>
149+
<id>sign-artifacts</id>
150+
<phase>verify</phase>
151+
<goals>
152+
<goal>sign</goal>
153+
</goals>
154+
</execution>
155+
</executions>
156+
</plugin>
157+
</plugins>
158+
</build>
159+
</profile>
160+
<profile>
161+
<id>local</id>
162+
<distributionManagement>
163+
<snapshotRepository>
164+
<id>snapshots</id>
165+
<url>http://localhost:8081/nexus/content/repositories/snapshots</url>
166+
</snapshotRepository>
167+
<repository>
168+
<id>releases</id>
169+
<url>http://localhost:8081/nexus/content/repositories/releases</url>
170+
</repository>
171+
</distributionManagement>
172+
</profile>
173+
</profiles>
174+
61175
</project>

src/com/cloudinary/Api.java renamed to src/main/java/com/cloudinary/Api.java

File renamed without changes.

src/com/cloudinary/Cloudinary.java renamed to src/main/java/com/cloudinary/Cloudinary.java

File renamed without changes.

src/com/cloudinary/EagerTransformation.java renamed to src/main/java/com/cloudinary/EagerTransformation.java

File renamed without changes.

src/com/cloudinary/SmartUrlEncoder.java renamed to src/main/java/com/cloudinary/SmartUrlEncoder.java

File renamed without changes.

src/com/cloudinary/Transformation.java renamed to src/main/java/com/cloudinary/Transformation.java

File renamed without changes.

src/com/cloudinary/Uploader.java renamed to src/main/java/com/cloudinary/Uploader.java

File renamed without changes.

0 commit comments

Comments
 (0)