Author: dennisl Date: Sat Sep 21 09:10:03 2013 New Revision: 1525206 URL: http://svn.apache.org/r1525206 Log: Set correct Subversion properties: eol-style and keywords.
Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/invoker.properties (props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom (contents, props changed) maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh (props changed) maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml (props changed) Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/invoker.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/invoker.properties ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml Sat Sep 21 09:10:03 2013 @@ -1,48 +1,48 @@ -<?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. --> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.maven.its.deploy.dae.fail</groupId> - <artifactId>dae</artifactId> - <version>1.0</version> - </parent> - <artifactId>module1</artifactId> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <AlwaysFail /> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> +<?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. --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.deploy.dae.fail</groupId> + <artifactId>dae</artifactId> + <version>1.0</version> + </parent> + <artifactId>module1</artifactId> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <AlwaysFail /> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/module1/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml Sat Sep 21 09:10:03 2013 @@ -1,100 +1,100 @@ -<?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. ---> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.deploy.dae.fail</groupId> - <artifactId>dae</artifactId> - <version>1.0</version> - <packaging>pom</packaging> - - <description> - Tests deployment at end. - </description> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <distributionManagement> - <repository> - <id>it</id> - <url>file:///${basedir}/target/repo</url> - <uniqueVersion>false</uniqueVersion> - </repository> - </distributionManagement> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>@project.version@</version> - <configuration> - <deployAtEnd>true</deployAtEnd> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - </plugin> - </plugins> - </build> - - <modules> - <module>module1</module> - </modules> -</project> +<?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. +--> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.deploy.dae.fail</groupId> + <artifactId>dae</artifactId> + <version>1.0</version> + <packaging>pom</packaging> + + <description> + Tests deployment at end. + </description> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <distributionManagement> + <repository> + <id>it</id> + <url>file:///${basedir}/target/repo</url> + <uniqueVersion>false</uniqueVersion> + </repository> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <deployAtEnd>true</deployAtEnd> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.0.4</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + </plugin> + </plugins> + </build> + + <modules> + <module>module1</module> + </modules> +</project> Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy Sat Sep 21 09:10:03 2013 @@ -1,26 +1,26 @@ -/* - * 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. - */ - -assert !( new File( basedir, "target/repo/org/apache/maven/its/deploy/dae/fail/dae/1.0/dae-1.0.pom" ).exists() ) -assert !( new File( basedir, "module1/target/repo/org/apache/maven/its/deploy/dae/fail/module1/1.0/module1-1.0.pom" ).exists() ) - -File buildLog = new File( basedir, 'build.log' ) -assert buildLog.exists() -assert buildLog.text.contains( "[INFO] Deploying org.apache.maven.its.deploy.dae.fail:dae:1.0 at end" ) - +/* + * 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. + */ + +assert !( new File( basedir, "target/repo/org/apache/maven/its/deploy/dae/fail/dae/1.0/dae-1.0.pom" ).exists() ) +assert !( new File( basedir, "module1/target/repo/org/apache/maven/its/deploy/dae/fail/module1/1.0/module1-1.0.pom" ).exists() ) + +File buildLog = new File( basedir, 'build.log' ) +assert buildLog.exists() +assert buildLog.text.contains( "[INFO] Deploying org.apache.maven.its.deploy.dae.fail:dae:1.0 at end" ) + Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-fail/verify.groovy ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml Sat Sep 21 09:10:03 2013 @@ -1,48 +1,48 @@ -<?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. --> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.maven.its.deploy.dae.pass</groupId> - <artifactId>dae</artifactId> - <version>1.0</version> - </parent> - <artifactId>module1</artifactId> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.2</version> - <executions> - <execution> - <id>enforce</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <AlwaysPass /> - </rules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> +<?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. --> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.deploy.dae.pass</groupId> + <artifactId>dae</artifactId> + <version>1.0</version> + </parent> + <artifactId>module1</artifactId> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <AlwaysPass /> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/module1/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml Sat Sep 21 09:10:03 2013 @@ -1,100 +1,100 @@ -<?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. ---> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.deploy.dae.pass</groupId> - <artifactId>dae</artifactId> - <version>1.0</version> - <packaging>pom</packaging> - - <description> - Tests deployment at end. - </description> - - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - - <distributionManagement> - <repository> - <id>it</id> - <url>file:///${basedir}/target/repo</url> - <uniqueVersion>false</uniqueVersion> - </repository> - </distributionManagement> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>@project.version@</version> - <configuration> - <deployAtEnd>true</deployAtEnd> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3.1</version> - </plugin> - </plugins> - </build> - - <modules> - <module>module1</module> - </modules> -</project> +<?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. +--> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.deploy.dae.pass</groupId> + <artifactId>dae</artifactId> + <version>1.0</version> + <packaging>pom</packaging> + + <description> + Tests deployment at end. + </description> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <distributionManagement> + <repository> + <id>it</id> + <url>file:///${basedir}/target/repo</url> + <uniqueVersion>false</uniqueVersion> + </repository> + </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <deployAtEnd>true</deployAtEnd> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.0.4</version> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + </plugin> + </plugins> + </build> + + <modules> + <module>module1</module> + </modules> +</project> Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/pom.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy Sat Sep 21 09:10:03 2013 @@ -1,26 +1,26 @@ -/* - * 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. - */ - -assert new File( basedir, "target/repo/org/apache/maven/its/deploy/dae/pass/dae/1.0/dae-1.0.pom" ).exists() -assert new File( basedir, "module1/target/repo/org/apache/maven/its/deploy/dae/pass/module1/1.0/module1-1.0.pom" ).exists() - -File buildLog = new File( basedir, 'build.log' ) -assert buildLog.exists() -assert buildLog.text.contains( "[INFO] Deploying org.apache.maven.its.deploy.dae.pass:dae:1.0 at end" ) - +/* + * 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. + */ + +assert new File( basedir, "target/repo/org/apache/maven/its/deploy/dae/pass/dae/1.0/dae-1.0.pom" ).exists() +assert new File( basedir, "module1/target/repo/org/apache/maven/its/deploy/dae/pass/module1/1.0/module1-1.0.pom" ).exists() + +File buildLog = new File( basedir, 'build.log' ) +assert buildLog.exists() +assert buildLog.text.contains( "[INFO] Deploying org.apache.maven.its.deploy.dae.pass:dae:1.0 at end" ) + Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/deploy-at-end-pass/verify.groovy ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Modified: maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom?rev=1525206&r1=1525205&r2=1525206&view=diff ============================================================================== --- maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom (original) +++ maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom Sat Sep 21 09:10:03 2013 @@ -1,34 +1,34 @@ -<?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. ---> - -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.maven.its.deploy.erj</groupId> - <artifactId>parent</artifactId> - <version>1.0</version> - </parent> - - <!-- NOTE: Inherit everything from the parent --> - <artifactId>test</artifactId> - -</project> +<?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. +--> + +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.deploy.erj</groupId> + <artifactId>parent</artifactId> + <version>1.0</version> + </parent> + + <!-- NOTE: Inherit everything from the parent --> + <artifactId>test</artifactId> + +</project> Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/external-release-jar/test-0.1.pom ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Propchange: maven/plugins/trunk/maven-deploy-plugin/src/it/mdeploy-45-test/verify.bsh ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id Propchange: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml ------------------------------------------------------------------------------ svn:keywords = Date Revision Author Id