commit 692ca95e98624755bf7bbf142bcf2d8cb4382e19
author mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> Fri Dec 10 15:05:01 2010 +0000
committer mcculls <mcculls@d779f126-a31b-0410-b53b-1d3aecad763e> Fri Dec 10 15:05:01 2010 +0000
tree 7ef640e442fddf59caba9286b2fbbad51f98aaf8
parent 16f8b0fdf6f1993f6d5d714d86fd455065301474

Align Maven no_aop classifier to match the Ant target

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1454 d779f126-a31b-0410-b53b-1d3aecad763e

core/pom.xml

diff --git a/core/pom.xml b/core/pom.xml
index 615263d..0708c73 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -99,10 +99,10 @@
       <!--
        | No-AOP profile: repeat the build lifecycle with munged no-AOP source
       -->
-      <id>guice.with.noaop</id>
+      <id>guice.with.no_aop</id>
       <activation>
         <property>
-          <name>guice.with.noaop</name>
+          <name>guice.with.no_aop</name>
           <value>!false</value>
         </property>
       </activation>
@@ -137,20 +137,20 @@
             </executions>
           </plugin>
           <!--
-           | Package the no-AOP build with its own OSGi manifest and attach using "noaop" classifier
+           | Package the no-AOP build with its own OSGi manifest and attach using "no_aop" classifier
           -->
           <plugin>
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <id>noaop</id>
+                <id>no_aop</id>
                 <phase>package</phase>
                 <goals>
                   <goal>jar</goal>
                 </goals>
                 <configuration>
                   <classesDirectory>${project.build.directory}/munged/classes</classesDirectory>
-                  <classifier>noaop</classifier>
+                  <classifier>no_aop</classifier>
                   <archive>
                     <manifestFile>${project.build.directory}/munged/classes/META-INF/MANIFEST.MF</manifestFile>
                   </archive>
@@ -202,14 +202,14 @@
             <artifactId>maven-jar-plugin</artifactId>
             <executions>
               <execution>
-                <id>nodeps</id>
+                <id>no_deps</id>
                 <phase>package</phase>
                 <goals>
                   <goal>jar</goal>
                 </goals>
                 <configuration>
                   <classesDirectory>${project.build.directory}/original-classes</classesDirectory>
-                  <classifier>nodeps</classifier>
+                  <classifier>no_deps</classifier>
                 </configuration>
               </execution>
             </executions>

extensions/pom.xml

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 9cc27ca..70db0e9 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -101,7 +101,7 @@
           <groupId>com.google.inject</groupId>
           <artifactId>guice</artifactId>
           <version>${project.version}</version>
-          <classifier>nodeps</classifier>
+          <classifier>no_deps</classifier>
           <optional>true</optional>
         </dependency>
       </dependencies>

pom.xml

diff --git a/pom.xml b/pom.xml
index cba3ca3..f807602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,9 +104,9 @@
     -->
     <guice.with.jarjar>true</guice.with.jarjar>
     <!--
-     | Use "-Dguice.with.noaop=false" to skip the no-AOP variant
+     | Use "-Dguice.with.no_aop=false" to skip the no-AOP variant
     -->
-    <guice.with.noaop>true</guice.with.noaop>
+    <guice.with.no_aop>true</guice.with.no_aop>
   </properties>
 
   <dependencies>