--- pom.xml 2010-08-03 14:16:57.000000000 +0200 +++ pom.xml-gil 2012-03-09 12:57:28.481823868 +0100 @@ -90,12 +90,12 @@ <dependency> <groupId>org.apache.activemq.protobuf</groupId> <artifactId>activemq-protobuf</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.activemq.protobuf</groupId> <artifactId>activemq-protobuf-test</artifactId> - <version>${version}</version> + <version>${project.version}</version> </dependency> @@ -127,20 +127,20 @@ <artifactId>maven-bundle-plugin</artifactId> <version>1.0.0</version> </plugin> - <plugin> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>ianal-maven-plugin</artifactId> <version>1.0-alpha-1</version> - </plugin> + </plugin--> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> <version>2.0</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> - <version>1.0-alpha-3</version> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.8-SNAPSHOT</version> <configuration> <excludeSubProjects>false</excludeSubProjects> </configuration> @@ -164,8 +164,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Bundle-Name>${artifactId}</Bundle-Name> - <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> <Export-Package>org.apache.activemq.protobuf.*</Export-Package> <Implementation-Title>Apache ActiveMQ Protobuf</Implementation-Title> <Implementation-Version>${project.version}</Implementation-Version> @@ -204,7 +204,7 @@ </execution> </executions> </plugin> - <plugin> + <!--plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>ianal-maven-plugin</artifactId> <executions> @@ -217,7 +217,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -239,8 +239,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>rat-maven-plugin</artifactId> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> </plugin> </plugins> @@ -287,7 +287,7 @@ </activation> <build> <plugins> - <plugin> + <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -307,16 +307,16 @@ </execution> </executions> <dependencies> - <dependency> + <dependency--> <!-- apache version not yet released --> <!--<groupId>org.apache</groupId>--> - <groupId>org.apache.geronimo.genesis</groupId> - <artifactId>apache-source-release-assembly-descriptor</artifactId> + <!--groupId>org.apache.geronimo.genesis</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId--> <!-- apache version not yet known --> - <version>2.0</version> + <!--version>2.0</version> </dependency> </dependencies> - </plugin> + </plugin--> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -327,7 +327,7 @@ <plugin> <groupId>org.apache.activemq.protobuf</groupId> <artifactId>activemq-protobuf</artifactId> - <version>${version}</version> + <version>${project.version}</version> </plugin> </plugins> </build>