You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/09 14:22:23 UTC
svn commit: r1079784 - in /aries/trunk:
blueprint/blueprint-sample-annotation/pom.xml
parent/default-parent/java6-parent/pom.xml parent/default-parent/pom.xml
parent/pom.xml
Author: zoe
Date: Wed Mar 9 13:22:23 2011
New Revision: 1079784
URL: http://svn.apache.org/viewvc?rev=1079784&view=rev
Log:
ARIES-598 Part of the way towards decoupling export package version from bundle version
Modified:
aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
aries/trunk/parent/default-parent/java6-parent/pom.xml
aries/trunk/parent/default-parent/pom.xml
aries/trunk/parent/pom.xml
Modified: aries/trunk/blueprint/blueprint-sample-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-sample-annotation/pom.xml?rev=1079784&r1=1079783&r2=1079784&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-sample-annotation/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-sample-annotation/pom.xml Wed Mar 9 13:22:23 2011
@@ -72,9 +72,6 @@
<instructions>
<Bundle-Blueprint-Annotation>true</Bundle-Blueprint-Annotation>
</instructions>
- <versions>
- <aries.osgi.version.clean>${project.version}</aries.osgi.version.clean>
- </versions>
</configuration>
</plugin>
Modified: aries/trunk/parent/default-parent/java6-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/java6-parent/pom.xml?rev=1079784&r1=1079783&r2=1079784&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java6-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java6-parent/pom.xml Wed Mar 9 13:22:23 2011
@@ -79,6 +79,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<targetJdk>1.6</targetJdk>
</configuration>
Modified: aries/trunk/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1079784&r1=1079783&r2=1079784&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Wed Mar 9 13:22:23 2011
@@ -285,6 +285,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
+ <resource>
+ <directory>${project.build.sourceDirectory}</directory>
+ <includes>
+ <include>**/packageinfo</include>
+ </includes>
+ </resource>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -447,77 +453,8 @@
<Export-Service>${aries.osgi.export.service}</Export-Service>
<Import-Service>${aries.osgi.import.service}</Import-Service>
</instructions>
- <versions>
- <aries.osgi.version.clean>${project.version}</aries.osgi.version.clean>
- </versions>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>create-prop</id>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
- <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" />
- <property name="mv" value="${project.version}" />
- <echo message="Maven version: ${mv}" />
- <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\2" defaultValue=".0" />
- <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\3" defaultValue=".0" />
- <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?" replace=".\4" defaultValue="" />
- <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)" replace="\1" defaultValue="0" />
- <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)" replace="\1" defaultValue=".0" />
- <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)" replace="\1" defaultValue="" />
- <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}" />
- <echo message="OSGi version: ${ov}" />
- <mkdir dir="target" />
- <echo message="aries.osgi.version.clean = ${ov}" file="target/aries.osgi.version.txt" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
- <file>target/aries.osgi.version.txt</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -659,9 +596,14 @@
<aries.osgi.activator />
<aries.osgi.failok>false</aries.osgi.failok>
<aries.osgi.private.pkg>${project.artifactId}*.impl</aries.osgi.private.pkg>
- <aries.osgi.export>${aries.osgi.export.pkg};${aries.osgi.version};-noimport:=true</aries.osgi.export>
+ <!--
+ Hard coded version must be changed
+ -->
+ <aries.osgi.export>${aries.osgi.export.pkg};version=0.4.0;-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>!*.impl;${project.artifactId}*</aries.osgi.export.pkg>
+
<aries.osgi.version>version=${project.version}</aries.osgi.version>
+
<aries.osgi.split.pkg>-split-package:=first</aries.osgi.split.pkg>
<aries.osgi.import>${aries.osgi.import.pkg}</aries.osgi.import>
<aries.osgi.dynamic />
Modified: aries/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/parent/pom.xml?rev=1079784&r1=1079783&r2=1079784&view=diff
==============================================================================
--- aries/trunk/parent/pom.xml (original)
+++ aries/trunk/parent/pom.xml Wed Mar 9 13:22:23 2011
@@ -26,6 +26,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>7</version>
+ <relativePath/>
</parent>
<groupId>org.apache.aries</groupId>