Gert, There is a huge problem with this commit because the jars have the same name as those in the central repo while having a different content. This means that if a user can not be sure which one it has in its local repo, making the build not reproductible. I've gone ahead and changed the maven version to be 6.1.12-rc1 instead of 6.1.12rc1.
On Tue, Sep 9, 2008 at 12:17 PM, <[EMAIL PROTECTED]> wrote: > Author: gertv > Date: Tue Sep 9 03:17:25 2008 > New Revision: 693417 > > URL: http://svn.apache.org/viewvc?rev=693417&view=rev > Log: > SMX4-94: Temporarily adding a set of bundles with correct OSGi metadata > > Added: > servicemix/m2-repo/org/mortbay/ > servicemix/m2-repo/org/mortbay/jetty/ > servicemix/m2-repo/org/mortbay/jetty/jetty/ > servicemix/m2-repo/org/mortbay/jetty/jetty-client/ > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/ > > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.jar > (with props) > > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.pom > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/ > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/ > > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.jar > (with props) > > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.pom > servicemix/m2-repo/org/mortbay/jetty/jetty-util/ > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/ > > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.jar > (with props) > > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.pom > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/ > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.jar > (with props) > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.pom > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.jar > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.jar?rev=693417&view=auto > ============================================================================== > Binary file - no diff available. > > Propchange: > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.jar > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.pom > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.pom?rev=693417&view=auto > ============================================================================== > --- > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.pom > (added) > +++ > servicemix/m2-repo/org/mortbay/jetty/jetty-client/6.1.12rc1/jetty-client-6.1.12rc1.pom > Tue Sep 9 03:17:25 2008 > @@ -0,0 +1,113 @@ > +<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";> > + <parent> > + <artifactId>project</artifactId> > + <groupId>org.mortbay.jetty</groupId> > + <version>6.1.12rc1</version> > + </parent> > + <modelVersion>4.0.0</modelVersion> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-client</artifactId> > + <name>Jetty HTTP Client</name> > + <url>http://jetty.mortbay.org</url> > + <licenses> > + <license> > + <name>Apache License Version 2</name> > + <url>http://www.apache.org/licenses/LICENSE-2.0</url> > + </license> > + </licenses> > + <build> > + <defaultGoal>install</defaultGoal> > + <plugins> > + <plugin> > + <artifactId>maven-compiler-plugin</artifactId> > + <configuration> > + <source>1.5</source> > + <target>1.5</target> > + </configuration> > + </plugin> > + <plugin> > + <artifactId>maven-antrun-plugin</artifactId> > + <executions> > + <execution> > + <id>copyfiles</id> > + <phase>install</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <copy failonerror="false" > file="target/${project.artifactId}-${project.version}.${project.packaging}" > todir="../../lib/ext" /> > + </tasks> > + </configuration> > + </execution> > + <execution> > + <id>clean</id> > + <phase>clean</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <delete failonerror="false" > file="../../lib/ext/${project.artifactId}-${project.version}.${project.packaging}"/> > + </tasks> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + <version>${maven-bundle-plugin-version}</version> > + <extensions>true</extensions> > + <executions> > + <execution> > + <goals> > + <goal>manifest</goal> > + </goals> > + <configuration> > + <instructions> > + > <Bundle-SymbolicName>org.mortbay.jetty.client</Bundle-SymbolicName> > + > <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment> > + <Import-Package>*</Import-Package> > + > <Export-Package>org.mortbay.jetty.client;version=${project.version}</Export-Package> > + <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL> > + </instructions> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jar-plugin</artifactId> > + <version>${maven-jar-plugin-version}</version> > + <configuration> > + <archive> > + > <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> > + </archive> > + </configuration> > + </plugin> > + </plugins> > + </build> > + <dependencies> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-sslengine</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-util</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <scope>test</scope> > + </dependency> > + </dependencies> > +</project> > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.jar > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.jar?rev=693417&view=auto > ============================================================================== > Binary file - no diff available. > > Propchange: > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.jar > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.pom > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.pom?rev=693417&view=auto > ============================================================================== > --- > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.pom > (added) > +++ > servicemix/m2-repo/org/mortbay/jetty/jetty-sslengine/6.1.12rc1/jetty-sslengine-6.1.12rc1.pom > Tue Sep 9 03:17:25 2008 > @@ -0,0 +1,106 @@ > +<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";> > + <parent> > + <artifactId>project</artifactId> > + <groupId>org.mortbay.jetty</groupId> > + <version>6.1.12rc1</version> > + <relativePath>../../pom.xml</relativePath> > + </parent> > + <modelVersion>4.0.0</modelVersion> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-sslengine</artifactId> > + <name>Jetty SSLEngine</name> > + <url>http://jetty.mortbay.org</url> > + <licenses> > + <license> > + <name>Apache License Version 2</name> > + <url>http://www.apache.org/licenses/LICENSE-2.0</url> > + </license> > + </licenses> > + <build> > + <defaultGoal>install</defaultGoal> > + <plugins> > + <plugin> > + <artifactId>maven-compiler-plugin</artifactId> > + <configuration> > + <source>1.5</source> > + <target>1.5</target> > + </configuration> > + </plugin> > + <plugin> > + <artifactId>maven-antrun-plugin</artifactId> > + <executions> > + <execution> > + <id>copyfiles</id> > + <phase>install</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <copy failonerror="false" > file="target/${project.artifactId}-${project.version}.${project.packaging}" > todir="../../lib/ext" /> > + <copy failonerror="false" > file="src/main/resources/jetty-sslengine.xml" todir="../../etc" /> > + </tasks> > + </configuration> > + </execution> > + <execution> > + <id>clean</id> > + <phase>clean</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <delete failonerror="false" > file="../../lib/ext/${project.artifactId}-${project.version}.${project.packaging}"/> > + <delete failonerror="false" > file="../../etc/jetty-sslengine.xml"/> > + </tasks> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + <version>${maven-bundle-plugin-version}</version> > + <extensions>true</extensions> > + <executions> > + <execution> > + <goals> > + <goal>manifest</goal> > + </goals> > + <configuration> > + <instructions> > + > <Bundle-SymbolicName>org.mortbay.jetty.security</Bundle-SymbolicName> > + > <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment> > + <Import-Package>*</Import-Package> > + > <Export-Package>org.mortbay.jetty.security;version=${project.version}</Export-Package> > + <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL> > + </instructions> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jar-plugin</artifactId> > + <version>${maven-jar-plugin-version}</version> > + <configuration> > + <archive> > + > <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> > + </archive> > + </configuration> > + </plugin> > + </plugins> > + </build> > + <dependencies> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <scope>test</scope> > + </dependency> > + </dependencies> > +</project> > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.jar > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.jar?rev=693417&view=auto > ============================================================================== > Binary file - no diff available. > > Propchange: > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.jar > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.pom > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.pom?rev=693417&view=auto > ============================================================================== > --- > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.pom > (added) > +++ > servicemix/m2-repo/org/mortbay/jetty/jetty-util/6.1.12rc1/jetty-util-6.1.12rc1.pom > Tue Sep 9 03:17:25 2008 > @@ -0,0 +1,114 @@ > +<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";> > + <parent> > + <artifactId>project</artifactId> > + <groupId>org.mortbay.jetty</groupId> > + <version>6.1.12rc1</version> > + <relativePath>../../pom.xml</relativePath> > + </parent> > + <modelVersion>4.0.0</modelVersion> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-util</artifactId> > + <name>Jetty Utilities</name> > + <url>http://jetty.mortbay.org</url> > + <description>Utility classes for Jetty</description> > + <build> > + <defaultGoal>install</defaultGoal> > + <resources> > + <resource> > + <directory>src/main/java</directory> > + <includes> > + <include>org/mortbay/**/*.properties</include> > + <include>org/mortbay/**/*.dtd</include> > + <include>org/mortbay/**/*.xml</include> > + </includes> > + </resource> > + </resources> > + <testResources> > + <testResource> > + <directory>src/test/java</directory> > + <includes> > + <include>**/*Test.java</include> > + <include>org/mortbay/**/*.xml</include> > + </includes> > + <excludes> > + <exclude>**/Abstract*.java</exclude> > + </excludes> > + </testResource> > + </testResources> > + <plugins> > + <plugin> > + <artifactId>maven-antrun-plugin</artifactId> > + <executions> > + <execution> > + <id>clean</id> > + <phase>clean</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <delete failonerror="false" > file="../../lib/${project.artifactId}-${project.version}.${project.packaging}" > /> > + </tasks> > + </configuration> > + </execution> > + <execution> > + <id>copyjar</id> > + <phase>install</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <copy failonerror="false" > file="target/${project.artifactId}-${project.version}.${project.packaging}" > todir="../../lib/" /> > + </tasks> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + <version>${maven-bundle-plugin-version}</version> > + <extensions>true</extensions> > + <executions> > + <execution> > + <goals> > + <goal>manifest</goal> > + </goals> > + <configuration> > + <instructions> > + > <Bundle-SymbolicName>org.mortbay.jetty.util</Bundle-SymbolicName> > + > <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment> > + > <Import-Package>!org.mortbay.*,org.slf4j;resolution:=optional,*</Import-Package> > + <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL> > + </instructions> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jar-plugin</artifactId> > + <version>${maven-jar-plugin-version}</version> > + <configuration> > + <archive> > + > <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> > + </archive> > + </configuration> > + </plugin> > + </plugins> > + </build> > + <dependencies> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <scope>test</scope> > + </dependency> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>servlet-api-2.5</artifactId> > + <version>${project.version}</version> > + <scope>provided</scope> > + </dependency> > + </dependencies> > +</project> > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.jar > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.jar?rev=693417&view=auto > ============================================================================== > Binary file - no diff available. > > Propchange: > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.jar > ------------------------------------------------------------------------------ > svn:mime-type = application/octet-stream > > Added: > servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.pom > URL: > http://svn.apache.org/viewvc/servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.pom?rev=693417&view=auto > ============================================================================== > --- servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.pom > (added) > +++ servicemix/m2-repo/org/mortbay/jetty/jetty/6.1.12rc1/jetty-6.1.12rc1.pom > Tue Sep 9 03:17:25 2008 > @@ -0,0 +1,111 @@ > +<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";> > + <parent> > + <artifactId>project</artifactId> > + <groupId>org.mortbay.jetty</groupId> > + <version>6.1.12rc1</version> > + <relativePath>../../pom.xml</relativePath> > + </parent> > + <modelVersion>4.0.0</modelVersion> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty</artifactId> > + <name>Jetty Server</name> > + <url>http://jetty.mortbay.org</url> > + <description>Jetty server core</description> > + <build> > + <defaultGoal>install</defaultGoal> > + <resources> > + <resource> > + <directory>src/main/resources</directory> > + </resource> > + </resources> > + <testResources> > + <testResource> > + <directory>src/test/resources</directory> > + </testResource> > + </testResources> > + <plugins> > + <plugin> > + <artifactId>maven-antrun-plugin</artifactId> > + <executions> > + <execution> > + <id>clean</id> > + <phase>clean</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <delete includeemptydirs="true"> > + <fileset dir="../../lib/" > includes="${project.artifactId}-${project.version}.${project.packaging}" /> > + <fileset dir="../../lib/" includes="servlet-api-2.5.jar" /> > + <fileset dir="../../etc/" includes="webdefault.xml" /> > + </delete> > + </tasks> > + </configuration> > + </execution> > + <execution> > + <id>copyjar</id> > + <phase>install</phase> > + <goals> > + <goal>run</goal> > + </goals> > + <configuration> > + <tasks> > + <copy failonerror="false" > file="target/${project.artifactId}-${project.version}.${project.packaging}" > tofile="../../lib/${project.artifactId}-${project.version}.${project.packaging}" > /> > + <copy failonerror="false" > file="src/main/resources/org/mortbay/jetty/webapp/webdefault.xml" > tofile="../../etc/webdefault.xml" /> > + </tasks> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + <version>${maven-bundle-plugin-version}</version> > + <extensions>true</extensions> > + <executions> > + <execution> > + <goals> > + <goal>manifest</goal> > + </goals> > + <configuration> > + <instructions> > + > <Bundle-SymbolicName>org.mortbay.jetty.server</Bundle-SymbolicName> > + > <Bundle-RequiredExcutionEnvironment>J2SE-1.4</Bundle-RequiredExcutionEnvironment> > + <Bundle-DocURL>http://jetty.mortbay.org</Bundle-DocURL> > + > <Import-Package>!org.mortbay.jetty.*,!org.mortbay.xml.*,!org.mortbay.resource.*,!org.mortbay.io.*,!org.mortbay.servlet.jetty.*,javax.servlet.resources;resolution:=optional,javax.servlet.jsp;resolution:=optional,org.apache.jasper.servlet;resolution:=optional,org.mortbay.jetty.handler.management;resolution:=optional,*</Import-Package> > + </instructions> > + </configuration> > + </execution> > + </executions> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jar-plugin</artifactId> > + <version>${maven-jar-plugin-version}</version> > + <configuration> > + <archive> > + > <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> > + </archive> > + </configuration> > + </plugin> > + </plugins> > + </build> > + <dependencies> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <scope>test</scope> > + </dependency> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>jetty-util</artifactId> > + <version>${project.version}</version> > + </dependency> > + <dependency> > + <groupId>org.mortbay.jetty</groupId> > + <artifactId>servlet-api-2.5</artifactId> > + <version>${project.version}</version> > + </dependency> > + </dependencies> > +</project> > > > -- Cheers, Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/
