Skip to content

Commit 9506bb1

Browse files
fabiomaffiolettifabiomaffioletti
committed
pom cleaning
1 parent 4851d2e commit 9506bb1

File tree

6 files changed

+23
-35
lines changed

6 files changed

+23
-35
lines changed

‎jsondoc-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project
2+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

@@ -11,7 +12,6 @@
1112

1213
<groupId>org.jsondoc</groupId>
1314
<artifactId>jsondoc-core</artifactId>
14-
<version>1.0.1-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<name>jsondoc-core</name>

‎jsondoc-parent/pom.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626
</properties>
2727

28-
<profiles>
29-
<profile>
30-
<id>work</id>
31-
<properties>
32-
<git.local.repo>file:///home/fabio/workspace_fabio/fm-repo/</git.local.repo>
33-
</properties>
34-
</profile>
35-
<profile>
36-
<id>home</id>
37-
<properties>
38-
<git.local.repo>file:///Users/fabio/workspace/fm-repo/</git.local.repo>
39-
</properties>
40-
</profile>
41-
</profiles>
42-
4328
<repositories>
4429
<repository>
4530
<id>springource-artifactory</id>
@@ -53,13 +38,13 @@
5338
<dependency>
5439
<groupId>org.jsondoc</groupId>
5540
<artifactId>jsondoc-core</artifactId>
56-
<version>1.0.1-SNAPSHOT</version>
41+
<version>${project.version}</version>
5742
</dependency>
5843

5944
<dependency>
6045
<groupId>org.jsondoc</groupId>
6146
<artifactId>jsondoc-springmvc</artifactId>
62-
<version>1.0.1-SNAPSHOT</version>
47+
<version>${project.version}</version>
6348
</dependency>
6449

6550
<!-- Spring -->

‎jsondoc-sample-springmvc/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<parent>
6+
<artifactId>jsondoc-parent</artifactId>
7+
<groupId>org.jsondoc</groupId>
8+
<version>1.0.1-SNAPSHOT</version>
9+
<relativePath>../jsondoc-parent/pom.xml</relativePath>
10+
</parent>
11+
512
<groupId>org.jsondoc</groupId>
613
<artifactId>jsondoc-sample-springmvc</artifactId>
7-
<version>1.0.1-SNAPSHOT</version>
814
<packaging>war</packaging>
915

1016
<name>jsondoc-sample-springmvc</name>
@@ -16,12 +22,6 @@
1622
</properties>
1723

1824
<profiles>
19-
<profile>
20-
<id>dotcloud</id>
21-
<properties>
22-
<base.path>http://jsondoc-fabiomaffioletti.dotcloud.com/api</base.path>
23-
</properties>
24-
</profile>
2525
<profile>
2626
<id>appfog</id>
2727
<properties>
@@ -41,13 +41,13 @@
4141
<dependency>
4242
<groupId>org.jsondoc</groupId>
4343
<artifactId>jsondoc-core</artifactId>
44-
<version>1.0.1-SNAPSHOT</version>
44+
<version>${project.version}</version>
4545
</dependency>
4646

4747
<dependency>
4848
<groupId>org.jsondoc</groupId>
4949
<artifactId>jsondoc-springmvc</artifactId>
50-
<version>1.0.1-SNAPSHOT</version>
50+
<version>${project.version}</version>
5151
</dependency>
5252

5353
<dependency>
@@ -158,7 +158,7 @@
158158
<artifactId>maven-antrun-plugin</artifactId>
159159
<executions>
160160
<execution>
161-
<id>copy-war-for-dotcloud-deploy</id>
161+
<id>copy-war-for-appfog-deploy</id>
162162
<phase>package</phase>
163163
<configuration>
164164
<tasks>

‎jsondoc-springmvc/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0"?>
21
<project
32
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
43
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13,7 +12,7 @@
1312

1413
<groupId>org.jsondoc</groupId>
1514
<artifactId>jsondoc-springmvc</artifactId>
16-
<version>1.0.1-SNAPSHOT</version>
15+
<packaging>jar</packaging>
1716

1817
<name>jsondoc-springmvc</name>
1918
<description>The Spring MVC helper of the jsondoc project</description>

‎jsondoc-ui/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0"?>
21
<project
32
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
43
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -13,7 +12,6 @@
1312

1413
<groupId>org.jsondoc</groupId>
1514
<artifactId>jsondoc-ui</artifactId>
16-
<version>1.0.1-SNAPSHOT</version>
1715
<packaging>war</packaging>
1816

1917
<name>jsondoc-ui</name>
@@ -25,7 +23,7 @@
2523
<dependency>
2624
<groupId>org.jsondoc</groupId>
2725
<artifactId>jsondoc-sample-springmvc</artifactId>
28-
<version>1.0.1-SNAPSHOT</version>
26+
<version>${project.version}</version>
2927
<type>war</type>
3028
</dependency>
3129

‎pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<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/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
<parent>
6+
<artifactId>jsondoc-parent</artifactId>
7+
<groupId>org.jsondoc</groupId>
8+
<version>1.0.1-SNAPSHOT</version>
9+
<relativePath>jsondoc-parent/pom.xml</relativePath>
10+
</parent>
11+
512
<groupId>org.jsondoc</groupId>
613
<artifactId>jsondoc-master</artifactId>
714
<packaging>pom</packaging>
8-
<version>1.0.1-SNAPSHOT</version>
915
<name>jsondoc-master</name>
1016

1117
<modules>

0 commit comments

Comments
 (0)