aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1598584 - in /aries/trunk/proxy: pom.xml proxy-api/pom.xml proxy-bundle/pom.xml proxy-impl/pom.xml proxy-itests/pom.xml
Date Fri, 30 May 2014 13:05:33 GMT
Author: jbonofre
Date: Fri May 30 13:05:32 2014
New Revision: 1598584

URL: http://svn.apache.org/r1598584
Log:
[ARIES-1006] Upgrade to the "new" parent pom in proxy modules

Modified:
    aries/trunk/proxy/pom.xml
    aries/trunk/proxy/proxy-api/pom.xml
    aries/trunk/proxy/proxy-bundle/pom.xml
    aries/trunk/proxy/proxy-impl/pom.xml
    aries/trunk/proxy/proxy-itests/pom.xml

Modified: aries/trunk/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/pom.xml?rev=1598584&r1=1598583&r2=1598584&view=diff
==============================================================================
--- aries/trunk/proxy/pom.xml (original)
+++ aries/trunk/proxy/pom.xml Fri May 30 13:05:32 2014
@@ -1,3 +1,4 @@
+<?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
@@ -18,29 +19,29 @@
 -->
 <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>
+
     <parent>
         <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>  
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.aries.proxy</groupId>
     <artifactId>proxy</artifactId>
     <name>Apache Aries Class Proxy</name>
     <packaging>pom</packaging>
     <version>1.0.1-SNAPSHOT</version>
-
     <description>
        A common proxy class generation service that can be used by blueprint and jndi and
others.
     </description>
 
     <modules>
-      <module>proxy-api</module>
-      <module>proxy-impl</module>
-      <module>proxy-bundle</module>
-      <module>proxy-itests</module>
+        <module>proxy-api</module>
+        <module>proxy-impl</module>
+        <module>proxy-bundle</module>
+        <module>proxy-itests</module>
     </modules>
 
 </project>

Modified: aries/trunk/proxy/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1598584&r1=1598583&r2=1598584&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Fri May 30 13:05:32 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>
+
     <parent>
-    <groupId>org.apache.aries</groupId>
-        <artifactId>java5-parent</artifactId>
-        <version>1.0.0</version>
-        <relativePath />
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.proxy</groupId>
@@ -34,16 +37,14 @@
         This bundle contains the Apache Aries Proxy service API.
     </description>
 
-     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api</url>
-     </scm>
-
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-api</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api</url>
+    </scm>
 
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
-
         <aries.osgi.export.pkg>
             org.apache.aries.proxy*
         </aries.osgi.export.pkg>
@@ -56,15 +57,13 @@
             org.osgi.framework.hooks.weaving;resolution:=optional,
             *
         </aries.osgi.import.pkg>
-        <aries.osgi.private.pkg>
-        </aries.osgi.private.pkg>
+        <aries.osgi.private.pkg></aries.osgi.private.pkg>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -95,7 +94,5 @@
             </plugin>
         </plugins>
     </build>
-    
-    
-     
+
 </project>

Modified: aries/trunk/proxy/proxy-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1598584&r1=1598583&r2=1598584&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-bundle/pom.xml (original)
+++ aries/trunk/proxy/proxy-bundle/pom.xml Fri May 30 13:05:32 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>
+
     <parent>
-          <groupId>org.apache.aries</groupId>
-          <artifactId>java5-parent</artifactId>
-          <version>1.0.0</version>
-          <relativePath />
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.proxy</groupId>
@@ -40,7 +43,6 @@
         <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle</url>
     </scm>
 
-
     <properties>
         <!-- Export package versions are maintained in packageinfo files -->
         <aries.osgi.activator>
@@ -81,7 +83,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -102,7 +103,6 @@
         </dependency>
     </dependencies>
 
-  
     <build>
         <plugins>
             <plugin>
@@ -124,4 +124,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1598584&r1=1598583&r2=1598584&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Fri May 30 13:05:32 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
  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>
+
     <parent>
-         <groupId>org.apache.aries</groupId>
-         <artifactId>java5-parent</artifactId>
-         <version>1.0.0</version>
-         <relativePath />
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.proxy</groupId>
@@ -35,15 +38,14 @@
     </description>
 
     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-impl</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl</url>
     </scm>
 
-
     <properties>
         <aries.osgi.export.pkg>
-          org.apache.aries.proxy.weaving;
+            org.apache.aries.proxy.weaving;
         </aries.osgi.export.pkg>
         <aries.osgi.activator>
             org.apache.aries.proxy.impl.ProxyManagerActivator
@@ -84,20 +86,19 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.3.0</version>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -110,85 +111,89 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-        	<groupId>org.apache.aries.proxy</groupId>
-        	<artifactId>org.apache.aries.proxy.api</artifactId>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.api</artifactId>
             <version>1.0.0</version>
         </dependency>
     </dependencies>
 
     <build>
-     <plugins>
-       <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-compiler-plugin</artifactId>
-           <version>3.1</version>
-       </plugin>
-       <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-         <executions>
-           <execution>
-             <phase>process-classes</phase>
-             <configuration>
-               <tasks>
-                 <!-- run the Synthesizer on the WovenProxy class -->
-                 <java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath"
fork="false">
-                       <arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"
/>
-                 </java>
-                 
-                 <delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"
/>
-                 
-               </tasks>
-             </configuration>
-             <goals>
-               <goal>run</goal>
-             </goals>
-           </execution>
-         </executions>
-       </plugin>
-
-       <plugin>
-	       <groupId>org.apache.maven.plugins</groupId>
-	       <artifactId>maven-enforcer-plugin</artifactId>
-	       <executions>
-	           <execution>
-	               <phase>validate</phase>
-	               <goals>
-	                   <goal>enforce</goal>
-	               </goals>
-	               <configuration>
-	                   <rules>
-	                       <requireJavaVersion>
-	                           <version>[1.5,)</version>
-	                       </requireJavaVersion>
-	                   </rules>
-	               </configuration>
-	           </execution>
-	           <execution>
-	             <id>check-java15</id>
-	             <phase>test</phase>
-	             <goals>
-	               <goal>enforce</goal>
-	             </goals>
-	             <configuration>
-	               <rules>
-	                 <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
-	                   <ignoreDependencies>true</ignoreDependencies>
-	                   <ignores>
-	    			  <ignore>sun.reflect.*</ignore>
-	  				</ignores>
-	                   <signature>
-	                     <groupId>org.codehaus.mojo.signature</groupId>
-	                     <artifactId>java15</artifactId>
-	                     <version>1.0</version>
-	                   </signature>
-	                 </checkSignatureRule>
-	               </rules>
-	             </configuration>
-	           </execution>
-	       </executions>	       
-	   </plugin>
-	   <plugin>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <configuration>
+                            <tasks>
+                                <!-- run the Synthesizer on the WovenProxy class -->
+                                <java classname="org.apache.aries.proxy.synthesizer.Synthesizer"
+                                      classpathref="maven.runtime.classpath" fork="false">
+                                    <arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
+                                </java>
+
+                                <delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
+
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[1.7,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <!--
+                    <execution>
+                        <id>check-java15</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <checkSignatureRule
+                                        implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
+                                    <ignoreDependencies>true</ignoreDependencies>
+                                    <ignores>
+                                        <ignore>sun.reflect.*</ignore>
+                                    </ignores>
+                                    <signature>
+                                        <groupId>org.codehaus.mojo.signature</groupId>
+                                        <artifactId>java15</artifactId>
+                                        <version>1.0</version>
+                                    </signature>
+                                </checkSignatureRule>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    -->
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.aries.versioning</groupId>
                 <artifactId>org.apache.aries.versioning.plugin</artifactId>
                 <version>0.1.0</version>
@@ -205,7 +210,7 @@
                     </execution>
                 </executions>
             </plugin>
-     </plugins>
+        </plugins>
     </build>
 
 </project>

Modified: aries/trunk/proxy/proxy-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1598584&r1=1598583&r2=1598584&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-itests/pom.xml (original)
+++ aries/trunk/proxy/proxy-itests/pom.xml Fri May 30 13:05:32 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,29 +18,30 @@
  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>
+
     <parent>
-       <groupId>org.apache.aries</groupId>
-       <artifactId>java5-parent</artifactId>
-       <version>1.0.0</version>
-       <relativePath />
+        <groupId>org.apache.aries</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.proxy</groupId>
     <artifactId>org.apache.aries.proxy.itests</artifactId>
     <version>1.0.1-SNAPSHOT</version>
-    
     <name>Apache Aries Proxy iTests</name>
     <description>
         Integration tests using the standalone proxy-bundle.
     </description>
 
     <scm>
-         <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</connection>
-         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</developerConnection>
-         <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/proxy/proxy-itests</developerConnection>
+        <url>http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests</url>
     </scm>
-    
+
     <properties>
         <exam.version>3.4.0</exam.version>
         <url.version>1.6.0</url.version>
@@ -76,12 +78,12 @@
             <version>1.0.0</version>
         </dependency>
         <dependency>
-          <groupId>org.apache.aries.testsupport</groupId>
-          <artifactId>org.apache.aries.testsupport.unit</artifactId>
-          <version>2.0.0-SNAPSHOT</version>
-          <scope>test</scope>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
-        
+
         <!-- pax exam -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -146,7 +148,6 @@
             <artifactId>asm-all</artifactId>
             <version>5.0.2</version>
             <scope>test</scope>
-            
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
@@ -169,19 +170,19 @@
                     <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
-			<plugin>
-            	<groupId>org.apache.servicemix.tooling</groupId>
-            	<artifactId>depends-maven-plugin</artifactId>
-            	<version>1.2</version>
-            	<executions>
-                	<execution>
-	                    <id>generate-depends-file</id>
-    	                <goals>
-        	                <goal>generate-depends-file</goal>
-                    	</goals>
-                	</execution>
-            	</executions>
-        	</plugin>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 



Mime
View raw message