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

o collapsing all the profile code into maven-project, now it's all in one place 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@699659 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-09-27 14:52:28 +00:00
parent 8de236d8ea
commit 1260ced4f5
13 changed files with 19 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -119,7 +119,7 @@ TODO:
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
<modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
<modello file="maven-profile/src/main/mdo/profiles.mdo"/>
<modello file="maven-project/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
<modello file="maven-toolchain/src/main/mdo/toolchains.xml"/>
</target>

4
maven-core/pom.xml
View File

@ -43,10 +43,6 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-reporting-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-profile</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>

59
maven-profile/pom.xml
View File

@ -1,59 +0,0 @@
<?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/maven-v4_0_0.xsd">
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-profile</artifactId>
<name>Maven Profile Model</name>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
<model>src/main/mdo/profiles.mdo</model>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
<!-- Generate model code -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
</project>

31
maven-profile/src/main/resources/META-INF/plexus/components.xml
View File

@ -1,31 +0,0 @@
<!--
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.
-->
<component-set>
<components>
<!--
|
|
|
-->
<component>
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
<implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
</component>
</components>
</component-set>

6
maven-profile/src/site/site.xml
View File

@ -1,6 +0,0 @@
<project>
<body>
<menu ref="parent"/>
<menu ref="reports"/>
</body>
</project>

16
maven-project/pom.xml
View File

@ -36,10 +36,6 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-workspace</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-profile</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
@ -78,4 +74,16 @@ under the License.
<artifactId>maven-shared-model</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<version>1.0.0</version>
<model>src/main/mdo/profiles.mdo</model>
</configuration>
</plugin>
</plugins>
</build>
</project>

0
maven-profile/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java → maven-project/src/main/java/org/apache/maven/profiles/AlwaysOnActivation.java
View File

0
maven-profile/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java → maven-project/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
View File

0
maven-profile/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java → maven-project/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
View File

0
maven-profile/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java → maven-project/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
View File

0
maven-profile/src/main/mdo/profiles.mdo → maven-project/src/main/mdo/profiles.mdo
View File

6
maven-project/src/main/resources/META-INF/plexus/components.xml
View File

@ -19,6 +19,12 @@ under the License.
<component-set>
<components>
<component>
<role>org.apache.maven.profiles.MavenProfilesBuilder</role>
<implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
</component>
<component>
<role>org.apache.maven.profiles.build.ProfileAdvisor</role>
<role-hint>default</role-hint>

1
pom.xml
View File

@ -253,7 +253,6 @@
<module>maven-lifecycle</module>
<module>maven-model</module>
<module>maven-plugin-api</module>
<module>maven-profile</module>
<module>maven-project</module>
<module>maven-reporting-api</module>
<module>maven-embedder</module>