Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-3656: cleanup is complete as far as I can tell. I also got rid of a bunch of deps that said were needed, but the build seems to work fine, and I'm about to try on Mr Hudson. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@674319 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-07-06 17:21:25 +00:00
parent d960c39994
commit 668818f6ba
3 changed files with 91 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
maven-embedder/pom.xml
View File

@ -1,34 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one or more
or more contributor license agreements. See the NOTICE file contributor license agreements. See the NOTICE file distributed with
distributed with this work for additional information this work for additional information regarding copyright ownership.
regarding copyright ownership. The ASF licenses this file The ASF licenses this file to you under the Apache License, Version
to you under the Apache License, Version 2.0 (the 2.0 (the "License"); you may not use this file except in compliance
"License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
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
http://www.apache.org/licenses/LICENSE-2.0 the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the
Unless required by applicable law or agreed to in writing, License for the specific language governing permissions and
software distributed under the License is distributed on an limitations under the License.
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
KIND, either express or implied. See the License for the <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
specific language governing permissions and limitations xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>maven</artifactId> <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<version>2.1-SNAPSHOT</version> <version>2.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>maven-embedder</artifactId> <artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name> <name>Maven Embedder</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -42,7 +36,6 @@ under the License.
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-toolchain</artifactId> <artifactId>maven-toolchain</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
@ -82,7 +75,6 @@ under the License.
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
@ -112,44 +104,8 @@ under the License.
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- These aren't used by the build, but need to be in the local repository for
some tests to work offline. Look to improve them.
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.3</version>
<extensions>true</extensions>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
</plugin>
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.3</version>
<extensions>true</extensions>
</plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- Single Test --> <!-- Single Test -->
@ -168,4 +124,4 @@ under the License.
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

118
maven-toolchain/pom.xml
View File

@ -1,62 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one or more
or more contributor license agreements. See the NOTICE file contributor license agreements. See the NOTICE file distributed with
distributed with this work for additional information this work for additional information regarding copyright ownership.
regarding copyright ownership. The ASF licenses this file The ASF licenses this file to you under the Apache License, Version
to you under the Apache License, Version 2.0 (the 2.0 (the "License"); you may not use this file except in compliance
"License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
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
http://www.apache.org/licenses/LICENSE-2.0 the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the
Unless required by applicable law or agreed to in writing, License for the specific language governing permissions and
software distributed under the License is distributed on an limitations under the License.
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
KIND, either express or implied. See the License for the <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
specific language governing permissions and limitations xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
under the License. <parent>
--><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"> <groupId>org.apache.maven</groupId>
<parent> <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId> <version>2.1-SNAPSHOT</version>
<artifactId>maven</artifactId> </parent>
<version>2.1-SNAPSHOT</version> <modelVersion>4.0.0</modelVersion>
</parent> <artifactId>maven-toolchain</artifactId>
<modelVersion>4.0.0</modelVersion> <name>Maven Toolchains</name>
<artifactId>maven-toolchain</artifactId> <dependencies>
<name>Maven Toolchains</name> <dependency>
<dependencies> <groupId>org.apache.maven</groupId>
<dependency> <artifactId>maven-core</artifactId>
<groupId>org.apache.maven</groupId> </dependency>
<artifactId>maven-core</artifactId> <dependency>
</dependency> <groupId>org.apache.maven.artifact</groupId>
<dependency> <artifactId>maven-artifact</artifactId>
<groupId>org.apache.maven.artifact</groupId> </dependency>
<artifactId>maven-artifact</artifactId> </dependencies>
</dependency> <build>
</dependencies> <plugins>
<build> <plugin>
<plugins> <groupId>org.codehaus.modello</groupId>
<plugin> <artifactId>modello-maven-plugin</artifactId>
<groupId>org.codehaus.modello</groupId> <executions>
<artifactId>modello-maven-plugin</artifactId> <execution>
<version>1.0-alpha-14</version> <goals>
<executions> <goal>java</goal>
<execution> <goal>xsd</goal>
<goals> <goal>xpp3-reader</goal>
<goal>java</goal> </goals>
<goal>xsd</goal> </execution>
<goal>xpp3-reader</goal> </executions>
</goals> <configuration>
</execution> <version>1.0.0</version>
</executions> <packageWithVersion>false</packageWithVersion>
<configuration> <model>src/main/mdo/toolchains.xml</model>
<version>1.0.0</version> </configuration>
<packageWithVersion>false</packageWithVersion> </plugin>
<model>src/main/mdo/toolchains.xml</model> </plugins>
</configuration> </build>
</plugin> </project>
</plugins>
</build>
</project>

37
maven-workspace/pom.xml
View File

@ -1,22 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one or more
or more contributor license agreements. See the NOTICE file contributor license agreements. See the NOTICE file distributed with
distributed with this work for additional information this work for additional information regarding copyright ownership.
regarding copyright ownership. The ASF licenses this file The ASF licenses this file to you under the Apache License, Version
to you under the Apache License, Version 2.0 (the 2.0 (the "License"); you may not use this file except in compliance
"License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
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
http://www.apache.org/licenses/LICENSE-2.0 the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the
Unless required by applicable law or agreed to in writing, License for the specific language governing permissions and
software distributed under the License is distributed on an limitations under the License.
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -->
KIND, either express or implied. See the License for the <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
specific language governing permissions and limitations xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
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/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>maven</artifactId> <artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
@ -25,11 +23,10 @@ under the License.
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>maven-workspace</artifactId> <artifactId>maven-workspace</artifactId>
<name>Maven Workspace</name> <name>Maven Workspace</name>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>