Update changelog files
Update release profile of 'it' projects
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1481831 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/composite-it/pom.xml b/ipojo/runtime/composite-it/pom.xml
index e41db3e..89070f8 100644
--- a/ipojo/runtime/composite-it/pom.xml
+++ b/ipojo/runtime/composite-it/pom.xml
@@ -217,6 +217,7 @@
<groupId>org.ow2.chameleon.testing</groupId>
<artifactId>tinybundles-ipojo</artifactId>
<version>0.3.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -250,66 +251,6 @@
<profiles>
<profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- <!-- we don't want to attach all the assemblies, such as bz2 -->
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-assemblies</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>
- ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
- </file>
- <classifier>project</classifier>
- <type>tar.gz</type>
- </artifact>
- <artifact>
- <file>
- ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
- </file>
- <classifier>project</classifier>
- <type>zip</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>knopflerfish</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -537,6 +478,40 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.apache.resources</groupId>
+ <artifactId>apache-source-release-assembly-descriptor</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>