Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jetty-dev] Re: [jetty-commit] r2074 - in jetty/trunk: jetty-continuation jetty-http jetty-osgi/jetty-osgi-boot jetty-osgi/jetty-osgi-boot-jsp jetty-osgi/jetty-osgi-boot-logback jetty-osgi/jetty-osgi-boot-warurl jetty-osgi/jetty-osgi-httpservice

On 6 July 2010 05:23, Joakim Erdfelt <joakim@xxxxxxxxxxx> wrote:
> Can we trim this rollback and add comments please?
> The inclusion of jar:jar is pointless and just causes problems with later
> tooling (it gets added twice, and with some reports will execute twice, and
> with other reports or plugins that fork the lifecycle, it will execute 4
> times)
> Also, if things outside of this uses the -test.jar, then put text into
> pom.xml indicating so.
> A quick pass through codehaus shows that only 1 test:jar is needed
> (jetty-servlet), yet you just added back all of them.
> Why?

Because it was 2am and I'd just staged 7.1.5 of jetty@eclipse and this
patch was breaking the staging of 7.1.5 of jetty@codehaus. I thought
it best (project wise and for my sleep (specially as the tour de
france had already ended for the night)) to roll back the whole change
and keep the artefacts published for all 7.1.x releases the same.

I've marked the next dev release as 7.2.0-SNAPSHOT as I think 7.1.5
will stand for a while and there are a few other structural changes
that are waiting for a 7.2.x - so I'm fine for the artefacts to be
trimmed in the 7.2.x time frame - but please do not forget
jetty@codehaus and always test it when making significant and/or
structural changes.

cheers






> - Joakim
> On Mon, Jul 5, 2010 at 6:50 AM, <genie@xxxxxxxxxxx> wrote:
>>
>> Author: gwilkins
>> Date: 2010-07-05 09:50:26 -0400 (Mon, 05 Jul 2010)
>> New Revision: 2074
>>
>> Modified:
>>   jetty/trunk/jetty-continuation/pom.xml
>>   jetty/trunk/jetty-http/pom.xml
>>   jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
>>   jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml
>>   jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
>>   jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml
>>   jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml
>>   jetty/trunk/jetty-server/pom.xml
>>   jetty/trunk/jetty-servlet/pom.xml
>>   jetty/trunk/jetty-websocket/pom.xml
>> Log:
>> rolled back r2014 because it is needed by codehaus release
>>
>> Modified: jetty/trunk/jetty-continuation/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-continuation/pom.xml      2010-07-05 12:43:19 UTC
>> (rev 2073)
>> +++ jetty/trunk/jetty-continuation/pom.xml      2010-07-05 13:50:26 UTC
>> (rev 2074)
>> @@ -34,6 +34,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-http/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-http/pom.xml      2010-07-05 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-http/pom.xml      2010-07-05 13:50:26 UTC (rev 2074)
>> @@ -47,6 +47,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml      2010-07-05
>> 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-osgi/jetty-osgi-boot/pom.xml      2010-07-05
>> 13:50:26 UTC (rev 2074)
>> @@ -58,6 +58,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml  2010-07-05
>> 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-osgi/jetty-osgi-boot-jsp/pom.xml  2010-07-05
>> 13:50:26 UTC (rev 2074)
>> @@ -67,6 +67,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml      2010-07-05
>> 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-osgi/jetty-osgi-boot-logback/pom.xml      2010-07-05
>> 13:50:26 UTC (rev 2074)
>> @@ -75,6 +75,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml       2010-07-05
>> 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-osgi/jetty-osgi-boot-warurl/pom.xml       2010-07-05
>> 13:50:26 UTC (rev 2074)
>> @@ -45,6 +45,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml       2010-07-05
>> 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-osgi/jetty-osgi-httpservice/pom.xml       2010-07-05
>> 13:50:26 UTC (rev 2074)
>> @@ -52,6 +52,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-server/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-server/pom.xml    2010-07-05 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-server/pom.xml    2010-07-05 13:50:26 UTC (rev 2074)
>> @@ -36,6 +36,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>
>> Modified: jetty/trunk/jetty-servlet/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-servlet/pom.xml   2010-07-05 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-servlet/pom.xml   2010-07-05 13:50:26 UTC (rev 2074)
>> @@ -38,6 +38,14 @@
>>
>> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>           </archive>
>>         </configuration>
>> +        <executions>
>> +          <execution>
>> +            <id>tests</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>       </plugin>
>>       <plugin>
>>         <groupId>org.codehaus.mojo</groupId>
>>
>> Modified: jetty/trunk/jetty-websocket/pom.xml
>> ===================================================================
>> --- jetty/trunk/jetty-websocket/pom.xml 2010-07-05 12:43:19 UTC (rev 2073)
>> +++ jetty/trunk/jetty-websocket/pom.xml 2010-07-05 13:50:26 UTC (rev 2074)
>> @@ -47,6 +47,20 @@
>>       <plugin>
>>         <groupId>org.apache.maven.plugins</groupId>
>>         <artifactId>maven-jar-plugin</artifactId>
>> +        <executions>
>> +          <execution>
>> +            <id>artifact-jar</id>
>> +            <goals>
>> +              <goal>jar</goal>
>> +            </goals>
>> +          </execution>
>> +          <execution>
>> +            <id>test-jar</id>
>> +            <goals>
>> +              <goal>test-jar</goal>
>> +            </goals>
>> +          </execution>
>> +        </executions>
>>         <configuration>
>>           <archive>
>>
>> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>
>> _______________________________________________
>> jetty-commit mailing list
>> jetty-commit@xxxxxxxxxxx
>> https://dev.eclipse.org/mailman/listinfo/jetty-commit
>
>
> _______________________________________________
> jetty-dev mailing list
> jetty-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/jetty-dev
>
>

Back to the top