Repository: flex-flexunit Updated Branches: refs/heads/develop e1c47a455 -> 472c9a845
- Adjusted the build to be able to publish artifacts to the central Apache Maven repository. - Updated the maven example to work with Apache Flex and Flexmojos 7 Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/472c9a84 Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/472c9a84 Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/472c9a84 Branch: refs/heads/develop Commit: 472c9a845b7b6422bc63cd885a869388f11a203f Parents: e1c47a4 Author: Christofer Dutz <[email protected]> Authored: Sat Apr 26 17:39:36 2014 +0200 Committer: Christofer Dutz <[email protected]> Committed: Sat Apr 26 17:39:36 2014 +0200 ---------------------------------------------------------------------- FlexUnit4/build.xml | 20 +++---- FlexUnit4AirCIListener/build.xml | 12 ++--- FlexUnit4AntTasks/build.xml | 10 ++-- FlexUnit4CIListener/build.xml | 44 ++++++++-------- FlexUnit4FlexCoverListener/build.xml | 12 ++--- FlexUnit4FluintExtensions/build.xml | 12 ++--- FlexUnit4SampleCIProject/pom.xml | 64 ++++++++--------------- FlexUnit4UIListener/build.xml | 44 ++++++++-------- RELEASE_NOTES | 1 + build.xml | 28 +++++----- pom.template | 87 ++++++++++++++++++++++++------- utils.xml | 11 ++-- 12 files changed, 189 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml index c5dc53e..c12d35f 100644 --- a/FlexUnit4/build.xml +++ b/FlexUnit4/build.xml @@ -35,7 +35,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="report.loc" location="${basedir}/target/report" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -89,7 +89,7 @@ <target name="init"> <!-- Create paths --> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${report.loc}" /> <mkdir dir="${doc.loc}" /> @@ -208,28 +208,28 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy flex swc to sonatype --> - <sonatype-deploy + <!-- deploy flex swc to apache-maven --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName.flex}.${build.packaging}" - todir="${sonatype.loc}/flex" + todir="${apache-maven.loc}/flex" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}-flex" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> - <!-- deploy as3 swc to sonatype --> - <sonatype-deploy + <!-- deploy as3 swc to apache-maven --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName.as3}.${build.packaging}" - todir="${sonatype.loc}/as3" + todir="${apache-maven.loc}/as3" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}-as3" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4AirCIListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4AirCIListener/build.xml b/FlexUnit4AirCIListener/build.xml index c7cf50d..d516848 100644 --- a/FlexUnit4AirCIListener/build.xml +++ b/FlexUnit4AirCIListener/build.xml @@ -32,7 +32,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -55,7 +55,7 @@ <target name="init"> <mkdir dir="${lib.loc}" /> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> @@ -107,16 +107,16 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy to sonatype repo --> - <sonatype-deploy + <!-- deploy to apache-maven repo --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName}.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4AntTasks/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4AntTasks/build.xml b/FlexUnit4AntTasks/build.xml index cba9382..93f0160 100644 --- a/FlexUnit4AntTasks/build.xml +++ b/FlexUnit4AntTasks/build.xml @@ -31,7 +31,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -46,7 +46,7 @@ <target name="init"> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> </target> @@ -95,17 +95,17 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <sonatype-deploy + <apache-deploy binaryFile="${dist.loc}/${build.finalName}.${build.packaging}" sourcesFile="${dist.loc}/${build.finalName}-sources.${build.packaging}" docFile="${dist.loc}/${build.finalName}-javadoc.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4CIListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4CIListener/build.xml b/FlexUnit4CIListener/build.xml index 137760c..667d915 100644 --- a/FlexUnit4CIListener/build.xml +++ b/FlexUnit4CIListener/build.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <project name="FlexUnit4CIListener" basedir="." default="package"> <import file="${basedir}/../utils.xml" /> <property environment="env" /> @@ -32,7 +32,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -54,7 +54,7 @@ <target name="init"> <mkdir dir="${lib.loc}" /> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> @@ -100,16 +100,16 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy to sonatype repo --> - <sonatype-deploy + <!-- deploy to apache-maven repo --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName}.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4FlexCoverListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FlexCoverListener/build.xml b/FlexUnit4FlexCoverListener/build.xml index 90aa9b0..844f9e3 100644 --- a/FlexUnit4FlexCoverListener/build.xml +++ b/FlexUnit4FlexCoverListener/build.xml @@ -32,7 +32,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -56,7 +56,7 @@ <target name="init"> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> @@ -113,16 +113,16 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy to sonatype repo --> - <sonatype-deploy + <!-- deploy to apache-maven repo --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName}.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4FluintExtensions/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4FluintExtensions/build.xml b/FlexUnit4FluintExtensions/build.xml index 26979fc..c574386 100644 --- a/FlexUnit4FluintExtensions/build.xml +++ b/FlexUnit4FluintExtensions/build.xml @@ -32,7 +32,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -57,7 +57,7 @@ <target name="init"> <mkdir dir="${lib.loc}" /> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> @@ -107,16 +107,16 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy to sonatype repo --> - <sonatype-deploy + <!-- deploy to apache-maven repo --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName}.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4SampleCIProject/pom.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4SampleCIProject/pom.xml b/FlexUnit4SampleCIProject/pom.xml index 7e2bed6..742eba1 100644 --- a/FlexUnit4SampleCIProject/pom.xml +++ b/FlexUnit4SampleCIProject/pom.xml @@ -16,9 +16,9 @@ limitations under the License. --> <!-- - Please note that this build file is an example of how to implement FlexMojos to execute all tests for a project following - Maven conventions. This is just one possible way to utilize FlexMojos and Maven. Please note, this build will fail - due to the sample test failures in this project. + Please note that this build file is an example of how to implement FlexMojos to execute all tests for a project + following Maven conventions. This is just one possible way to utilize FlexMojos and Maven. Please note, this build + will fail due to the sample test failures in this project. Please note to use the unit testing support baked into FlexMojos in this example, the Flash Player executable must be available on the PATH available to Maven. @@ -29,15 +29,15 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.flexunit</groupId> + <groupId>org.apache.flex.flexunit</groupId> <artifactId>demo</artifactId> <version>1.0.0</version> <packaging>swf</packaging> <name>FlexUnit4 Demo</name> <properties> - <flex.sdk.version>3.5.0.12683</flex.sdk.version> - <flexmojos.version>3.6.1</flexmojos.version> + <flex.sdk.version>4.12.0.20140303</flex.sdk.version> + <flexmojos.version>7.1.0-SNAPSHOT</flexmojos.version> </properties> <build> @@ -45,7 +45,7 @@ <testSourceDirectory>src/test/flex</testSourceDirectory> <plugins> <plugin> - <groupId>org.sonatype.flexmojos</groupId> + <groupId>net.flexmojos.oss</groupId> <artifactId>flexmojos-maven-plugin</artifactId> <version>${flexmojos.version}</version> <extensions>true</extensions> @@ -57,9 +57,12 @@ </includeTestFiles> </configuration> <dependencies> - <!-- Nice POM bundle available per SDK on Sonatype thanks to Flex-Mojos --> + <!-- + These bundles currently have to be created by a tool called + the Mavenizer, which is part of the flex-utilities + --> <dependency> - <groupId>com.adobe.flex</groupId> + <groupId>org.apache.flex</groupId> <artifactId>compiler</artifactId> <version>${flex.sdk.version}</version> <type>pom</type> @@ -70,47 +73,24 @@ </build> <dependencies> - <!-- Nice POM bundle available per SDK on Sonatype thanks to Flex-Mojos --> + <!-- + These bundles currently have to be created by a tool called + the Mavenizer, which is part of the flex-utilities + --> <dependency> - <groupId>com.adobe.flex.framework</groupId> + <groupId>org.apache.flex.framework</groupId> <artifactId>flex-framework</artifactId> <version>${flex.sdk.version}</version> <type>pom</type> </dependency> + <!-- Based on testing library dependency specified, FlexMojos will know how to test your application --> <dependency> - <groupId>com.adobe.flexunit</groupId> - <artifactId>flexunit</artifactId> - <version>4.0-rc-1</version> - <type>swc</type> - <scope>test</scope> + <groupId>org.apache.flex.flexunit</groupId> + <artifactId>flexunit-flex</artifactId> + <version>4.3.0</version> + <type>swc</type> </dependency> </dependencies> - <!-- Ideally this would go into your ~/.m2/settings.xml file --> - <repositories> - <repository> - <id>flex-mojos-repository</id> - <url>http://repository.sonatype.org/content/groups/flexgroup</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>flex-mojos-plugin-repository</id> - <url>http://repository.sonatype.org/content/groups/flexgroup</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/FlexUnit4UIListener/build.xml ---------------------------------------------------------------------- diff --git a/FlexUnit4UIListener/build.xml b/FlexUnit4UIListener/build.xml index 1c71479..138158b 100644 --- a/FlexUnit4UIListener/build.xml +++ b/FlexUnit4UIListener/build.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <project name="FlexUnit4UIListener" basedir="." default="package"> <import file="${basedir}/../utils.xml" /> <property environment="env" /> @@ -33,7 +33,7 @@ <!-- Generated --> <property name="dist.loc" location="${basedir}/target" /> - <property name="sonatype.loc" location="${dist.loc}/sonatype" /> + <property name="apache-maven.loc" location="${dist.loc}/apache-maven" /> <property name="bin.loc" location="${basedir}/target/bin" /> <property name="doc.loc" location="${basedir}/target/docs" /> @@ -56,7 +56,7 @@ <target name="init"> <mkdir dir="${lib.loc}" /> <mkdir dir="${dist.loc}" /> - <mkdir dir="${sonatype.loc}" /> + <mkdir dir="${apache-maven.loc}" /> <mkdir dir="${bin.loc}" /> <mkdir dir="${doc.loc}" /> @@ -160,16 +160,16 @@ </target> <target name="deploy" depends="package" description="Requires Ant-Contrib and GPG to work."> - <!-- deploy to sonatype repo --> - <sonatype-deploy + <!-- deploy to apache-maven repo --> + <apache-deploy binaryFile="${bin.loc}/${build.finalName}.${build.packaging}" - todir="${sonatype.loc}" + todir="${apache-maven.loc}" pomTemplate="${basedir}/../pom.template" artifact="${build.artifactId}" type="${build.packaging}" name="${build.deploy.name}" version="${build.version}" description="${build.deploy.description}"> - </sonatype-deploy> + </apache-deploy> </target> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/RELEASE_NOTES ---------------------------------------------------------------------- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 1e638bc..6e3d5a8 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -7,6 +7,7 @@ Differences from FlexUnit 4.2.0 include: Changes -------- +- Updated the maven example to using apache flex 4.12 and flexmojos 7.0.0 Bug Fixes ---------- http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a10100a..9d20e8c 100644 --- a/build.xml +++ b/build.xml @@ -331,7 +331,7 @@ to contribute to our CI process. <delete dir="${basedir}/out/temp" /> </target> - <target name="sonatype" depends="thirdparty-downloads" description="Target used to generate bundles for deployment to Sonatype."> + <target name="apache-maven" depends="thirdparty-downloads" description="Target used to generate bundles for deployment to Apaches Maven Repository."> <ant dir="${anttasks.loc}" target="deploy" inheritall="false"> <propertyset> <propertyref prefix="build" /> @@ -368,24 +368,24 @@ to contribute to our CI process. </propertyset> </ant> - <zip destfile="${basedir}/sonatype-${finalName}.zip"> - <zipfileset dir="${anttasks.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zip destfile="${basedir}/apache-maven-${finalName}.zip"> + <zipfileset dir="${anttasks.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> - <zipfileset dir="${core.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zipfileset dir="${core.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> - <zipfileset dir="${cilistener.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zipfileset dir="${cilistener.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> - <zipfileset dir="${flexcoverlistener.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zipfileset dir="${flexcoverlistener.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> - <zipfileset dir="${uilistener.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zipfileset dir="${uilistener.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> - <zipfileset dir="${aircilistener.loc}/target/sonatype"> - <include name="sonatype-*.zip" /> + <zipfileset dir="${aircilistener.loc}/target/apache-maven"> + <include name="apache-maven-*.zip" /> </zipfileset> </zip> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/pom.template ---------------------------------------------------------------------- diff --git a/pom.template b/pom.template index 0e84b10..2c70842 100644 --- a/pom.template +++ b/pom.template @@ -17,14 +17,27 @@ --> <project> <modelVersion>4.2.0</modelVersion> + + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>14</version> + </parent> + <groupId>org.apache.flex.flexunit</groupId> <artifactId>@ARTIFACT@</artifactId> + <version>@VERSION@</version> <packaging>@TYPE@</packaging> + <name>@NAME@</name> - <version>@VERSION@</version> <description>@DESCRIPTION@</description> <url>http://flex.apache.org/flexunit/tutorial</url> - + + <organization> + <name>The Apache Software Foundation</name> + <url>http://www.apache.org/</url> + </organization> + <licenses> <license> <name>Apache 2.0 License</name> @@ -33,24 +46,58 @@ </license> </licenses> - <developers> - <developer> - <id>apacheflex</id> - <name>Apache Flex</name> - <email>[email protected]</email> - <url>http:/flex.apache.org/</url> - <organization>The Apache Software Foundation</organization> - <organizationUrl>http://www.apache.org</organizationUrl> - <roles> - <role>developer</role> - </roles> - <timezone>0</timezone> - </developer> - </developers> - <scm> - <connection>scm:git:[email protected]:/apache/flex-flexunit.git</connection> - <developerConnection>scm:git:[email protected]:/apache/flex-flexunit.git</developerConnection> - <url>[email protected]:/apache/flex-flexunit.git</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-flexunit.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-flexunit.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf/flex-flexunit.git</url> </scm> + + <issueManagement> + <system>jira</system> + <url>https://issues.apache.org/jira/browse/FLEX</url> + </issueManagement> + + <repositories> + <repository> + <id>apache.releases</id> + <name>Apache Release Repository</name> + <url>https://repository.apache.org/content/repositories/releases</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/content/repositories/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + <mailingLists> + <mailingList> + <name>Apache Flex Developer List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/flex-users/</archive> + </mailingList> + <mailingList> + <name>Apache Flex User List</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/flex-dev/</archive> + </mailingList> + </mailingLists> + </project> http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/472c9a84/utils.xml ---------------------------------------------------------------------- diff --git a/utils.xml b/utils.xml index 803fe33..cafbe05 100644 --- a/utils.xml +++ b/utils.xml @@ -26,10 +26,12 @@ classpath="lib/ant-contrib-0.6.jar"/> <!-- defined maven snapshots and staging repository id and url --> - <property name="maven-staging-repository-id" value="sonatype-nexus-staging" /> - <property name="maven-staging-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/"; /> + <property name="maven-staging-repository-id" value="apache.releases.https" /> + <property name="maven-staging-repository-url" + value="https://repository.apache.org/service/local/staging/deploy/maven2"; /> + <property name="maven-pgp-passphrase" value=""/> - <macrodef name="sonatype-deploy"> + <macrodef name="apache-deploy"> <attribute name="binaryFile"/> <attribute name="sourcesFile" default=""/> <attribute name="docFile" default=""/> @@ -68,6 +70,7 @@ <artifact:arg value="-DrepositoryId=${maven-staging-repository-id}"/> <artifact:arg value="-DpomFile=@{todir}/pom.xml"/> <artifact:arg value="-Dfile=@{todir}/@{artifact}-@{version}.@{type}"/> + <artifact:arg value="-Dgpg.passphrase=${maven-pgp-passphrase}"/> <artifact:arg value="-Pgpg"/> </artifact:mvn> @@ -82,6 +85,7 @@ <artifact:arg value="-DpomFile=@{todir}/pom.xml"/> <artifact:arg value="-Dfile=@{todir}/@{artifact}-@{version}-sources.@{type}"/> <artifact:arg value="-Dclassifier=sources"/> + <artifact:arg value="-Dgpg.passphrase=${maven-pgp-passphrase}"/> <artifact:arg value="-Pgpg"/> </artifact:mvn> @@ -93,6 +97,7 @@ <artifact:arg value="-DpomFile=@{todir}/pom.xml"/> <artifact:arg value="-Dfile=@{todir}/@{artifact}-@{version}-javadoc.@{type}"/> <artifact:arg value="-Dclassifier=javadoc"/> + <artifact:arg value="-Dgpg.passphrase=${maven-pgp-passphrase}"/> <artifact:arg value="-Pgpg"/> </artifact:mvn> </then>
