geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r936551 - in /geronimo/yoko/trunk: distribution/pom.xml maven-plugins/pom.xml pom.xml
Date Wed, 21 Apr 2010 22:26:45 GMT
Author: djencks
Date: Wed Apr 21 22:26:45 2010
New Revision: 936551

URL: http://svn.apache.org/viewvc?rev=936551&view=rev
Log:
pom cleanup

Modified:
    geronimo/yoko/trunk/distribution/pom.xml
    geronimo/yoko/trunk/maven-plugins/pom.xml
    geronimo/yoko/trunk/pom.xml

Modified: geronimo/yoko/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/distribution/pom.xml?rev=936551&r1=936550&r2=936551&view=diff
==============================================================================
--- geronimo/yoko/trunk/distribution/pom.xml (original)
+++ geronimo/yoko/trunk/distribution/pom.xml Wed Apr 21 22:26:45 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

Modified: geronimo/yoko/trunk/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/maven-plugins/pom.xml?rev=936551&r1=936550&r2=936551&view=diff
==============================================================================
--- geronimo/yoko/trunk/maven-plugins/pom.xml (original)
+++ geronimo/yoko/trunk/maven-plugins/pom.xml Wed Apr 21 22:26:45 2010
@@ -26,7 +26,7 @@
   <parent>
       <groupId>org.apache.yoko</groupId>
       <artifactId>yoko</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>

Modified: geronimo/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/pom.xml?rev=936551&r1=936550&r2=936551&view=diff
==============================================================================
--- geronimo/yoko/trunk/pom.xml (original)
+++ geronimo/yoko/trunk/pom.xml Wed Apr 21 22:26:45 2010
@@ -46,7 +46,7 @@
         <bcel.version>5.2</bcel.version>
         <concurrent.version>1.3.4</concurrent.version>
         <junit.version>4.5</junit.version>
-        <maven.version>2.0.1</maven.version>
+        <maven.version>2.2.1</maven.version>
         <compiler.version>2.0.2</compiler.version>
         <eclipse.version>2.3</eclipse.version>
         <javadoc.version>2.2</javadoc.version>
@@ -60,13 +60,13 @@
         <no.checkstyle>false</no.checkstyle>
         <no.pmd>false</no.pmd>
         <notice.dir>.</notice.dir>
-    </properties>                         
+    </properties>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.yoko</groupId>
     <artifactId>yoko</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <name>Apache Yoko CORBA Server</name>     
+    <name>Apache Yoko CORBA Server</name>
     <inceptionYear>2006</inceptionYear>
     <description>Apache Yoko CORBA Server</description>
 
@@ -85,8 +85,8 @@
         <module>yoko-spec-corba</module>
         <module>yoko-rmi-spec</module>
         <module>yoko-rmi-impl</module>
-    <module>yoko-osgi</module>
-  </modules>
+        <module>yoko-osgi</module>
+    </modules>
 
     <dependencyManagement>
         <dependencies>
@@ -214,63 +214,10 @@
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
 
-            <!--<plugin>-->
-                <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
-                <!--<version>1.0-alpha-5</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>process</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<resourceBundles>-->
-                                <!--<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>-->
-                            <!--</resourceBundles>-->
-                            <!--<properties>-->
-                                <!--<addLicense>true</addLicense>-->
-                                <!--<projectName>Apache Geronimo Yoko</projectName>-->
-                            <!--</properties>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
         </plugins>
 
-        <!--<defaultGoal>install</defaultGoal>-->
-
         <pluginManagement>
             <plugins>
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                    <!--<version>${compiler.version}</version>-->
-                    <!--<configuration>-->
-                        <!--<source>${java.source.version}</source>-->
-                        <!--<target>${java.source.version}</target>-->
-                        <!--<showDeprecation>true</showDeprecation>-->
-                        <!--<fork>${compile.forked}</fork>-->
-                        <!--<compilerArgument>${compile.flags}</compilerArgument>-->
-                    <!--</configuration>-->
-                <!--</plugin>-->
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-jar-plugin</artifactId>-->
-                    <!--<version>${jar.version}</version>-->
-                    <!--<configuration>-->
-                        <!--<archive>-->
-                            <!--<manifest>-->
-                                <!--<addClasspath>true</addClasspath>-->
-                            <!--</manifest>-->
-                            <!--<manifestEntries>-->
-                                <!--<Specification-Title>${project.name}</Specification-Title>-->
-                                <!--<Specification-Vendor>The Apache Software Foundation</Specification-Vendor>-->
-                                <!--<Specification-Version>${version}</Specification-Version>-->
-                                <!--<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>-->
-                                <!--<Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>-->
-                            <!--</manifestEntries>-->
-                        <!--</archive>-->
-                    <!--</configuration>-->
-                <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
@@ -283,11 +230,6 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-dependency-plugin</artifactId>-->
-                    <!--<version>2.0-alpha-1</version>-->
-                <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -306,30 +248,11 @@
                         <argLine>-ea</argLine>
                     </configuration>
                 </plugin>
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>${site.version}</version>
                 </plugin>
-                <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-eclipse-plugin</artifactId>-->
-                    <!--<version>${eclipse.version}</version>-->
-                    <!--<configuration>-->
-                        <!--<downloadSources>true</downloadSources>-->
-                        <!--<buildcommands>-->
-                            <!--<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>-->
-                            <!--<java.lang.String>net.sourceforge.pmd.eclipse.pmdBuilder</java.lang.String>-->
-                        <!--</buildcommands>-->
-                        <!--<projectnatures>-->
-                            <!--<nature>org.eclipse.jdt.core.javanature</nature>-->
-                            <!--<nature>net.sourceforge.pmd.eclipse.pmdNature</nature>-->
-                        <!--</projectnatures>-->
-                    <!--</configuration>-->
-                <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
@@ -346,15 +269,6 @@
             </plugins>
         </pluginManagement>
 
-
-        <!--<extensions>-->
-            <!--<extension>-->
-                <!--<groupId>org.apache.maven.wagon</groupId>-->
-                <!--<artifactId>wagon-ssh-external</artifactId>-->
-                <!--<version>1.0-alpha-5</version>-->
-            <!--</extension>-->
-        <!--</extensions>-->
-
     </build>
 
     <reporting>
@@ -374,196 +288,6 @@
         </plugins>
     </reporting>
 
-    <!--<repositories>-->
-        <!--<repository>-->
-            <!--<id>apache-snapshots</id>-->
-            <!--<name>Apache repo</name>-->
-            <!--<url>http://people.apache.org/maven-snapshot-repository</url>-->
-            <!--<releases>-->
-                <!--<enabled>true</enabled>-->
-            <!--</releases>-->
-            <!--<snapshots>-->
-                <!--<enabled>true</enabled>-->
-            <!--</snapshots>-->
-        <!--</repository>-->
-        <!--<repository>-->
-            <!--<id>apache-incubator</id>-->
-            <!--<name>Apache incubating repo</name>-->
-            <!--<url>http://people.apache.org/repo/m2-incubating-repository</url>-->
-        <!--</repository>-->
-        <!--<repository>-->
-            <!--<id>java.net</id>-->
-            <!--<name>java.net Maven Repository</name>-->
-            <!--<url>https://maven-repository.dev.java.net/nonav/repository/</url>-->
-            <!--<layout>legacy</layout>-->
-        <!--</repository>-->
-    <!--</repositories>-->
-
-    <!--<pluginRepositories>-->
-        <!--<pluginRepository>-->
-            <!--<id>apache-incubator</id>-->
-            <!--<name>Apache incubating repo</name>-->
-            <!--<url>http://people.apache.org/repo/m2-incubating-repository</url>-->
-            <!--<layout>default</layout>-->
-        <!--</pluginRepository>-->
-    <!--</pluginRepositories>-->
-
-    <profiles>
-        <!--<profile>-->
-            <!--<id>release</id>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-release-plugin</artifactId>-->
-                        <!--<configuration>-->
-                            <!--<useReleaseProfile>false</useReleaseProfile>-->
-                            <!--<goals>deploy</goals>-->
-                            <!--<arguments>-Prelease</arguments>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
-
-                    <!--&lt;!&ndash; We want a source jar &ndash;&gt;-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-source-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-
-                    <!--&lt;!&ndash; We want to sign the artifact, the POM, and
all attached artifacts &ndash;&gt;-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-gpg-plugin</artifactId>-->
-                        <!--<inherited>true</inherited>-->
-                        <!--<configuration>-->
-                            <!--<passphrase>${gpg.passphrase}</passphrase>-->
-                        <!--</configuration>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>sign</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-
-                    <!--&lt;!&ndash; We want to deploy the artifact to a staging
location for perusal &ndash;&gt;-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-deploy-plugin</artifactId>-->
-                        <!--<inherited>true</inherited>-->
-                        <!--<configuration>-->
-                            <!--<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>-->
-                            <!--<updateReleaseInfo>true</updateReleaseInfo>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
-
-                    <!--&lt;!&ndash; We want the JavaDoc JAR published with the
release &ndash;&gt;-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                        <!--<inherited>true</inherited>-->
-                        <!--<configuration>-->
-                            <!--<source>1.4</source>-->
-                        <!--</configuration>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<id>attach-javadocs</id>-->
-                                <!--<goals>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
-        <!--</profile>-->
-        <!--<profile>-->
-            <!--&lt;!&ndash; this is a hack for eclipse - taken from Tuscany.
Eclipse doesn't-->
-            <!--like "." as a resource directory as then you have source directories-->
-            <!--inside a src directory which causes all sorts of problems.  so the-->
-            <!--resources directory gets pointed back to the resources directory  so-->
-            <!--the NOTICE.txt, LICENSE.txt and DISCLAIMER.txt files won't be included-->
-            <!--in the eclipse builds.-->
-            <!--&ndash;&gt;-->
-            <!--<id>eclipse</id>-->
-            <!--<properties>-->
-                <!--<notice.dir>src/main/resources</notice.dir>-->
-            <!--</properties>-->
-            <!--<build>-->
-                <!--<defaultGoal>process-test-sources</defaultGoal>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-eclipse-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<id>setup.eclipse.project</id>-->
-                                <!--<phase>process-test-sources</phase>-->
-                                <!--<goals>-->
-                                    <!--<goal>eclipse</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
-        <!--</profile>-->
-
-        <!--<profile>-->
-            <!--<id>deploy</id>-->
-            <!--<build>-->
-                <!--<defaultGoal>deploy</defaultGoal>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-source-plugin</artifactId>-->
-                        <!--<version>2.0.2</version>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<id>attach-sources</id>-->
-                                <!--<goals>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                        <!--<version>2.2</version>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<id>attach-javadocs</id>-->
-                                <!--<goals>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
-        <!--</profile>-->
-    </profiles>
-
-    <!--<ciManagement>-->
-        <!--<system>continuum</system>-->
-        <!--<url>http://vmbuild.apache.org/continuum</url>-->
-        <!--<notifiers>-->
-            <!--<notifier>-->
-                <!--<configuration>-->
-                    <!--<address>yoko-commits@incubator.apache.org</address>-->
-                <!--</configuration>-->
-            <!--</notifier>-->
-        <!--</notifiers>-->
-    <!--</ciManagement>-->
-
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/yoko/trunk</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/yoko/trunk</developerConnection>



Mime
View raw message