myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1197422 - in /myfaces/extensions/cdi/trunk/jee-modules/jpa-module: api/pom.xml api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java impl/pom.xml
Date Fri, 04 Nov 2011 08:22:27 GMT
Author: struberg
Date: Fri Nov  4 08:22:26 2011
New Revision: 1197422

URL: http://svn.apache.org/viewvc?rev=1197422&view=rev
Log:
EXTCDI-236 move ConfigurableDataSource to jpa-impl module

I also applied the JNDIUtils changes from gerhards previous commit

Removed:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/pom.xml
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/pom.xml

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/pom.xml?rev=1197422&r1=1197421&r2=1197422&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/pom.xml Fri Nov  4 08:22:26 2011
@@ -36,18 +36,6 @@
             <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
             <artifactId>myfaces-extcdi-core-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
-            <version>1.8.3</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -66,39 +54,6 @@
                     </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>
-                    </execution>
-                </executions>
-                <configuration>
-                    <createSourcesJar>true</createSourcesJar>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <minimizeJar>true</minimizeJar>
-                    <artifactSet>
-                        <includes>
-                            <include>commons-beanutils:commons-beanutils</include>
-                            <include>commons-logging:commons-logging</include>
-                        </includes>
-                    </artifactSet>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.apache.commons.beanutils</pattern>
-                            <shadedPattern>org.apache.myfaces.codi.shaded.commons.beanutils</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.apache.commons.logging</pattern>
-                            <shadedPattern>org.apache.myfaces.codi.shaded.commons.logging</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/pom.xml?rev=1197422&r1=1197421&r2=1197422&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/pom.xml Fri Nov  4 08:22:26 2011
@@ -50,6 +50,19 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+            <version>1.8.3</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <optional>true</optional>
+        </dependency>
+
         <!-- JPA API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -84,6 +97,7 @@
         </dependency>
 
 
+
     </dependencies>
 
     <build>
@@ -102,6 +116,40 @@
                     </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>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createSourcesJar>true</createSourcesJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <minimizeJar>true</minimizeJar>
+                    <artifactSet>
+                        <includes>
+                            <include>commons-beanutils:commons-beanutils</include>
+                            <include>commons-logging:commons-logging</include>
+                        </includes>
+                    </artifactSet>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.apache.commons.beanutils</pattern>
+                            <shadedPattern>org.apache.myfaces.codi.shaded.commons.beanutils</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.logging</pattern>
+                            <shadedPattern>org.apache.myfaces.codi.shaded.commons.logging</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 



Mime
View raw message