geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r963373 - in /geronimo/bundles/trunk: aspectjrt/pom.xml aspectjweaver/pom.xml sxc-jaxb/pom.xml sxc-runtime/pom.xml
Date Mon, 12 Jul 2010 17:30:21 GMT
Author: rickmcguire
Date: Mon Jul 12 17:30:21 2010
New Revision: 963373

URL: http://svn.apache.org/viewvc?rev=963373&view=rev
Log:
update package versions

Modified:
    geronimo/bundles/trunk/aspectjrt/pom.xml
    geronimo/bundles/trunk/aspectjweaver/pom.xml
    geronimo/bundles/trunk/sxc-jaxb/pom.xml
    geronimo/bundles/trunk/sxc-runtime/pom.xml

Modified: geronimo/bundles/trunk/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjrt/pom.xml?rev=963373&r1=963372&r2=963373&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjrt/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjrt/pom.xml Mon Jul 12 17:30:21 2010
@@ -63,9 +63,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.aspectj*;version="1.6.2"</Export-Package>
+                        <Export-Package>org.aspectj*;version="${pkgVersion}"</Export-Package>
                         <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/bundles/trunk/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjweaver/pom.xml?rev=963373&r1=963372&r2=963373&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjweaver/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjweaver/pom.xml Mon Jul 12 17:30:21 2010
@@ -63,9 +63,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.aspectj.weaver*;version="1.6.2"</Export-Package>
+                        <Export-Package>org.aspectj.weaver*;version="${pkgVersion}"</Export-Package>
                         <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,com*;resolution:=optional,*</Import-Package>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/bundles/trunk/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb/pom.xml?rev=963373&r1=963372&r2=963373&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-jaxb/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-jaxb/pom.xml Mon Jul 12 17:30:21 2010
@@ -75,7 +75,7 @@
             <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>jaxb-impl</artifactId>
             <optional>true</optional>
-            <version>2.2_2-SNAPSHOT</version>
+            <version>2.2_1</version>
         </dependency>
     </dependencies>
 
@@ -86,7 +86,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>com.envoisolutions.sxc*;version="0.7.2"</Export-Package>
+                        <Export-Package>com.envoisolutions.sxc*;version="${pkgVersion}"</Export-Package>
                         <Import-Package>
                             com.envoisolutions.sxc.builder*;resolution:=optional,
                             com.envoisolutions.sxc.compiler*;resolution:=optional,

Modified: geronimo/bundles/trunk/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime/pom.xml?rev=963373&r1=963372&r2=963373&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-runtime/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-runtime/pom.xml Mon Jul 12 17:30:21 2010
@@ -58,56 +58,12 @@
 
     <build>
         <plugins>
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-dependency-plugin</artifactId>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<id>unpack-dependencies</id>-->
-            <!--<phase>package</phase>-->
-            <!--<goals>-->
-            <!--<goal>unpack-dependencies</goal>-->
-            <!--</goals>-->
-            <!--<configuration>-->
-            <!--<includes>**/*</includes>-->
-            <!--<excludes>**/*.properties</excludes>-->
-            <!--<outputDirectory>${project.build.directory}/classes</outputDirectory>-->
-            <!--<overWriteReleases>false</overWriteReleases>-->
-            <!--<overWriteSnapshots>true</overWriteSnapshots>-->
-            <!--</configuration>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--</plugin>-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-shade-plugin</artifactId>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<phase>package</phase>-->
-                        <!--<goals>-->
-                            <!--<goal>shade</goal>-->
-                        <!--</goals>-->
-                        <!--<configuration>-->
-                            <!--<artifactSet>-->
-                                <!--<includes>-->
-                                    <!--<include>${pkgGroupId}:${pkgArtifactId}</include>-->
-                                    <!--<include>${pkgGroupId}:slf4j-log4j12</include>-->
-                                <!--</includes>-->
-                            <!--</artifactSet>-->
-                            <!--<promoteTransitiveDependencies>true</promoteTransitiveDependencies>-->
-                            <!--<createDependencyReducedPom>true</createDependencyReducedPom>-->
-                        <!--</configuration>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <!--<version>2.0.1-SNAPSHOT</version>-->
                 <configuration>
                     <instructions>
-                        <Export-Package>com.envoisolutions.sxc.util*;version="0.7.2"</Export-Package>
-                        <!--<Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail.*;resolution:=optional,org.slf4j.helpers;resolution:=optional,*</Import-Package>-->
+                        <Export-Package>com.envoisolutions.sxc.util*;version="${pkgVersion}"</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message