1 |
--- pom.xml 2010-08-03 14:16:57.000000000 +0200 |
2 |
+++ pom.xml-gil 2012-03-09 12:57:28.481823868 +0100 |
3 |
@@ -90,12 +90,12 @@ |
4 |
<dependency> |
5 |
<groupId>org.apache.activemq.protobuf</groupId> |
6 |
<artifactId>activemq-protobuf</artifactId> |
7 |
- <version>${version}</version> |
8 |
+ <version>${project.version}</version> |
9 |
</dependency> |
10 |
<dependency> |
11 |
<groupId>org.apache.activemq.protobuf</groupId> |
12 |
<artifactId>activemq-protobuf-test</artifactId> |
13 |
- <version>${version}</version> |
14 |
+ <version>${project.version}</version> |
15 |
</dependency> |
16 |
|
17 |
|
18 |
@@ -127,20 +127,20 @@ |
19 |
<artifactId>maven-bundle-plugin</artifactId> |
20 |
<version>1.0.0</version> |
21 |
</plugin> |
22 |
- <plugin> |
23 |
+ <!--plugin> |
24 |
<groupId>org.codehaus.mojo</groupId> |
25 |
<artifactId>ianal-maven-plugin</artifactId> |
26 |
<version>1.0-alpha-1</version> |
27 |
- </plugin> |
28 |
+ </plugin--> |
29 |
<plugin> |
30 |
<groupId>org.codehaus.mojo</groupId> |
31 |
<artifactId>javacc-maven-plugin</artifactId> |
32 |
<version>2.0</version> |
33 |
</plugin> |
34 |
<plugin> |
35 |
- <groupId>org.codehaus.mojo</groupId> |
36 |
- <artifactId>rat-maven-plugin</artifactId> |
37 |
- <version>1.0-alpha-3</version> |
38 |
+ <groupId>org.apache.rat</groupId> |
39 |
+ <artifactId>apache-rat-plugin</artifactId> |
40 |
+ <version>0.8-SNAPSHOT</version> |
41 |
<configuration> |
42 |
<excludeSubProjects>false</excludeSubProjects> |
43 |
</configuration> |
44 |
@@ -164,8 +164,8 @@ |
45 |
<extensions>true</extensions> |
46 |
<configuration> |
47 |
<instructions> |
48 |
- <Bundle-Name>${artifactId}</Bundle-Name> |
49 |
- <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName> |
50 |
+ <Bundle-Name>${project.artifactId}</Bundle-Name> |
51 |
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> |
52 |
<Export-Package>org.apache.activemq.protobuf.*</Export-Package> |
53 |
<Implementation-Title>Apache ActiveMQ Protobuf</Implementation-Title> |
54 |
<Implementation-Version>${project.version}</Implementation-Version> |
55 |
@@ -204,7 +204,7 @@ |
56 |
</execution> |
57 |
</executions> |
58 |
</plugin> |
59 |
- <plugin> |
60 |
+ <!--plugin> |
61 |
<groupId>org.codehaus.mojo</groupId> |
62 |
<artifactId>ianal-maven-plugin</artifactId> |
63 |
<executions> |
64 |
@@ -217,7 +217,7 @@ |
65 |
</configuration> |
66 |
</execution> |
67 |
</executions> |
68 |
- </plugin> |
69 |
+ </plugin--> |
70 |
<plugin> |
71 |
<groupId>org.apache.maven.plugins</groupId> |
72 |
<artifactId>maven-surefire-plugin</artifactId> |
73 |
@@ -239,8 +239,8 @@ |
74 |
</configuration> |
75 |
</plugin> |
76 |
<plugin> |
77 |
- <groupId>org.codehaus.mojo</groupId> |
78 |
- <artifactId>rat-maven-plugin</artifactId> |
79 |
+ <groupId>org.apache.rat</groupId> |
80 |
+ <artifactId>apache-rat-plugin</artifactId> |
81 |
</plugin> |
82 |
|
83 |
</plugins> |
84 |
@@ -287,7 +287,7 @@ |
85 |
</activation> |
86 |
<build> |
87 |
<plugins> |
88 |
- <plugin> |
89 |
+ <!--plugin> |
90 |
<groupId>org.apache.maven.plugins</groupId> |
91 |
<artifactId>maven-assembly-plugin</artifactId> |
92 |
<executions> |
93 |
@@ -307,16 +307,16 @@ |
94 |
</execution> |
95 |
</executions> |
96 |
<dependencies> |
97 |
- <dependency> |
98 |
+ <dependency--> |
99 |
<!-- apache version not yet released --> |
100 |
<!--<groupId>org.apache</groupId>--> |
101 |
- <groupId>org.apache.geronimo.genesis</groupId> |
102 |
- <artifactId>apache-source-release-assembly-descriptor</artifactId> |
103 |
+ <!--groupId>org.apache.geronimo.genesis</groupId> |
104 |
+ <artifactId>apache-source-release-assembly-descriptor</artifactId--> |
105 |
<!-- apache version not yet known --> |
106 |
- <version>2.0</version> |
107 |
+ <!--version>2.0</version> |
108 |
</dependency> |
109 |
</dependencies> |
110 |
- </plugin> |
111 |
+ </plugin--> |
112 |
<plugin> |
113 |
<groupId>org.apache.maven.plugins</groupId> |
114 |
<artifactId>maven-surefire-plugin</artifactId> |
115 |
@@ -327,7 +327,7 @@ |
116 |
<plugin> |
117 |
<groupId>org.apache.activemq.protobuf</groupId> |
118 |
<artifactId>activemq-protobuf</artifactId> |
119 |
- <version>${version}</version> |
120 |
+ <version>${project.version}</version> |
121 |
</plugin> |
122 |
</plugins> |
123 |
</build> |