[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [jetty-dev] Fixing our TERRIBLE eclipse oriented build
|
On 08/06/2010 07:25 PM, Jesse McConnell wrote:
> we still need to use this ant goop to build since we can't release
> with external maven repositories but this way we will at least have
> reproducible builds for longer then a week based on a tag
What do you mean by "we can't release with external maven repositories"?
I successfully tried to build 7.1.6 tag using maven repositories only, see attached patch. It needs more work to cleanup osgi submodule from manual downloading, because I simply commented it out in root pom.xml.
Regards,
Anton Lebedevich
commit 521b933176871415669732ebf1d8ae15f6733db1
Author: Anton Lebedevich <mabrek@xxxxxxxxx>
Date: Sat Aug 7 00:19:19 2010 +0400
switched from eclipse drop to maven artifacts
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index d82ef70..4fd432b 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -61,59 +61,14 @@
</goals>
<configuration>
<tasks>
- <!-- This is the Orbit Downloads Process -->
-
- <!-- Step 1: download orbit artifact into orbit-cache (if not present) -->
- <property name="orbit-cache" value="${user.home}/.m2/eclipse-orbit" />
-
- <mkdir dir="${orbit-cache}" />
- <get dest="${orbit-cache}" verbose="true" skipexisting="true">
- <url url="${orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
- <url url="${orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
- <url url="${orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
- <url url="${orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
- <url url="${orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
- <url url="${orbit-url}/javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
- <url url="${orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" />
- <url url="${orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
- <url url="${orbit-url}/org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
- </get>
-
- <mkdir dir="${orbit-cache}/${eclipse-drop}" />
- <get dest="${orbit-cache}/${eclipse-drop}" verbose="true" skipexisting="true">
- <url url="${eclipse-mirror}/${eclipse-drop}/ecj-${eclipse-ecj-version}.jar" />
- </get>
-
- <!-- Step 2: copy the orbit artifact from orbit-cache to the appropriate lib directory -->
-
<!-- ${jetty.home}/lib/ -->
<mkdir dir="${assembly-directory}/lib" />
- <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-2.5.jar" />
<!-- ${jetty.home}/lib/jndi/ -->
<mkdir dir="${assembly-directory}/lib/jndi" />
- <copy todir="${assembly-directory}/lib/jndi">
- <fileset dir="${orbit-cache}">
- <include name="javax.activation_${orbit-javax-activation-version}.jar" />
- <include name="javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
- </fileset>
- </copy>
<!-- ${jetty.home}/lib/jsp/ -->
<mkdir dir="${assembly-directory}/lib/jsp" />
- <copy todir="${assembly-directory}/lib/jsp">
- <fileset dir="${orbit-cache}">
- <include name="javax.el_${orbit-javax-el-version}.jar" />
- <include name="javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
- <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
- <include name="com.sun.el_${orbit-com-sun-el-version}.jar" />
- <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
- <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
- </fileset>
- <fileset dir="${orbit-cache}/${eclipse-drop}">
- <include name="ecj-${eclipse-ecj-version}.jar" />
- </fileset>
- </copy>
<copy file="../VERSION.txt" todir="${assembly-directory}" />
<chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
@@ -466,6 +421,42 @@
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax-activation-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax-mail-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${javax-transaction-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
<version>${project.version}</version>
@@ -474,6 +465,33 @@
<includes>**</includes>
<outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
</artifactItem>
+ <artifactItem>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>${javax-servlet-jsp-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1-glassfish</artifactId>
+ <version>${javax-servlet-jsp-version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.5.1</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
