chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1476600 - in /chemistry/opencmis/trunk: ./ chemistry-opencmis-server/chemistry-opencmis-server-jcr/ chemistry-opencmis-test/chemistry-opencmis-test-tck/ chemistry-opencmis-workbench/chemistry-opencmis-workbench/ chemistry-opencmis-workbenc...
Date Sat, 27 Apr 2013 15:25:48 GMT
Author: fmui
Date: Sat Apr 27 15:25:47 2013
New Revision: 1476600

URL: http://svn.apache.org/r1476600
Log:
plugin and Workbench packages updates

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
    chemistry/opencmis/trunk/pom.xml

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/pom.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/pom.xml
Sat Apr 27 15:25:47 2013
@@ -129,7 +129,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml Sat
Apr 27 15:25:47 2013
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>${junit.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
Sat Apr 27 15:25:47 2013
@@ -242,6 +242,12 @@
             <version>${log4j.version}</version>
         </dependency>
         <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${cxf.version}</version>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-assembly.xml
Sat Apr 27 15:25:47 2013
@@ -28,10 +28,10 @@
     
     <fileSets>
          <!-- license, readme, etc. calculated at build time -->
-	        <fileSet>
-	            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
-	            <outputDirectory>/</outputDirectory>
-	        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>
@@ -39,28 +39,37 @@
             <outputDirectory></outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
-        </file>        
+        </file>
         <file>
             <source>target/start/workbench.bat</source>
             <outputDirectory></outputDirectory>
             <lineEnding>dos</lineEnding>
         </file>
     </files>
-	<dependencySets>
-	    <dependencySet>
-          <outputDirectory>/lib</outputDirectory>
-	      <useProjectArtifact></useProjectArtifact>
-	      <unpack>false</unpack>
-	      <scope>runtime</scope>
-	      <useTransitiveFiltering>true</useTransitiveFiltering>
-          <excludes>
-              <exclude>com.sun.xml.ws:jaxws-rt</exclude>
-              <exclude>${project.groupId}:chemistry-opencmis-test-util</exclude>
-              <exclude>junit:junit</exclude>                       
-              <exclude>org.apache.felix:org.osgi.core</exclude>
-              <exclude>net.sf.jopt-simple:jopt-simple</exclude>
-          </excludes>
-	    </dependencySet>
-	  </dependencySets>
-
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useProjectArtifact></useProjectArtifact>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>junit:junit</exclude>
+                <exclude>org.apache.felix:org.osgi.core</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useProjectArtifact></useProjectArtifact>
+            <unpack>false</unpack>
+            <scope>provided</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>com.sun.xml.ws:jaxws-rt</exclude>
+                <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
+                <exclude>org.apache.cxf:cxf-rt-transports-http</exclude>
+                <exclude>org.apache:apache-jar-resource-bundle</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
 </assembly>

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/assembly/workbench-cxf-assembly.xml
Sat Apr 27 15:25:47 2013
@@ -28,10 +28,10 @@
     
     <fileSets>
          <!-- license, readme, etc. calculated at build time -->
-	        <fileSet>
-	            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
-	            <outputDirectory>/</outputDirectory>
-	        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
     </fileSets>
     <files>
         <file>
@@ -40,7 +40,7 @@
             <outputDirectory></outputDirectory>
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
-        </file>        
+        </file>
         <file>
             <source>target/start/workbench-cxf.bat</source>
             <destName>workbench.bat</destName>
@@ -48,28 +48,28 @@
             <lineEnding>dos</lineEnding>
         </file>
     </files>
-	<dependencySets>
-	    <dependencySet>
-          <outputDirectory>/lib</outputDirectory>
-	      <useProjectArtifact></useProjectArtifact>
-	      <unpack>false</unpack>
-	      <scope>runtime</scope>
-	      <useTransitiveFiltering>true</useTransitiveFiltering>
-          <excludes>
-              <exclude>com.sun.xml.ws:jaxws-rt</exclude>
-              <exclude>${project.groupId}:chemistry-opencmis-test-util</exclude>
-              <exclude>junit:junit</exclude>                       
-              <exclude>org.apache.felix:org.osgi.core</exclude>
-              <exclude>net.sf.jopt-simple:jopt-simple</exclude>
-          </excludes>
-	    </dependencySet>
-	    <dependencySet>
-          <outputDirectory>/lib</outputDirectory>
-	      <useProjectArtifact></useProjectArtifact>
-	      <unpack>false</unpack>
-	      <scope>provided</scope>
-	      <useTransitiveFiltering>true</useTransitiveFiltering>
-	    </dependencySet>
-	  </dependencySets>
-
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useProjectArtifact></useProjectArtifact>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>junit:junit</exclude>
+                <exclude>org.apache.felix:org.osgi.core</exclude>
+            </excludes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <useProjectArtifact></useProjectArtifact>
+            <unpack>false</unpack>
+            <scope>provided</scope>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>com.sun.xml.ws:jaxws-rt</exclude>
+                <exclude>org.apache:apache-jar-resource-bundle</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
 </assembly>

Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1476600&r1=1476599&r2=1476600&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Sat Apr 27 15:25:47 2013
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>9</version>
+        <version>13</version>
     </parent>
 
     <!-- Project Information -->
@@ -79,7 +79,7 @@
             <post>dev@chemistry.apache.org</post>
             <archive>
                 http://mail-archives.apache.org/mod_mbox/chemistry-dev/
-              </archive>
+            </archive>
         </mailingList>
         <mailingList>
             <name>Chemistry Source Control List</name>
@@ -229,7 +229,8 @@
         <site.staging.folder>/repos/asf/chemistry/site/trunk/content/java/${site.label}/maven</site.staging.folder>
         <site.staging.url>${site.staging.protocol}://${site.staging.host}${site.staging.folder}</site.staging.url>
         <parentBasedir>${project.basedir}</parentBasedir>
-        
+
+        <junit.version>4.11</junit.version>        
         <slf4j.version>1.7.5</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <cxf.version>2.7.4</cxf.version>
@@ -249,26 +250,32 @@
                     <version>3.3</version>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.2</version>
+                    <version>1.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>1.4</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.0</version>
+                <version>1.2</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -307,7 +314,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.4.1</version>
                 <configuration>
                     <useReleaseProfile>false</useReleaseProfile>
                     <!-- TODO: Add autogenerated JIRA release notes -->
@@ -336,7 +343,7 @@
             <plugin>
                 <inherited>true</inherited>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>2.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -351,12 +358,19 @@
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <configuration>
+                    <appendedResourcesDirectory>${parentBasedir}/src/main/appended-resources</appendedResourcesDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <version>2.9</version>
                 <configuration>
@@ -368,7 +382,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>maven-version-plugin</artifactId>
-                <version>1.0</version>
+                <version>2.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -450,7 +464,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>${junit.version}</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>
@@ -473,17 +487,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
+                <version>2.6</version>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8.1</version>
+              <version>2.9</version>
               <inherited>false</inherited>
               <reportSets>
                 <reportSet>
@@ -564,7 +578,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-remote-resources-plugin</artifactId>
-                        <version>1.3</version>
                         <configuration>
                             <appendedResourcesDirectory>${parentBasedir}/src/main/appended-resources</appendedResourcesDirectory>
                         </configuration>



Mime
View raw message