You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2016/06/05 13:49:40 UTC
svn commit: r1746919 - in /synapse/trunk/java: ./ modules/core/
modules/core/src/main/java/org/apache/synapse/libraries/util/
modules/core/src/test/resources/synapse-libraries/assembly/
modules/distribution/src/main/assembly/
Author: veithen
Date: Sun Jun 5 13:49:40 2016
New Revision: 1746919
URL: http://svn.apache.org/viewvc?rev=1746919&view=rev
Log:
* Fix the binary distribution descriptor:
* Remove unused exclusions for Xerces.
* Fix the exclusion for quickfix.
* Upgrade maven-assembly-plugin to fix issues with wildcards in exclusions.
* Fix a flaw in the library extraction logic exposed by the upgrade of maven-assembly-plugin.
* Upgrade maven-compiler-plugin to get meaningful compiler errors.
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java
synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eipcore-lib.xml
synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eiptest-lib.xml
synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-lib.xml
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Sun Jun 5 13:49:40 2016
@@ -84,7 +84,7 @@
<goal>attached</goal>
</goals>
<configuration>
- <finalName>synapse-test-lib</finalName>
+ <finalName>synapse</finalName>
<filters>
<filter>
${basedir}/src/test/resources/synapse-libraries/assembly/filter.properties
@@ -103,7 +103,7 @@
<goal>attached</goal>
</goals>
<configuration>
- <finalName>synapse-eiptest-lib</finalName>
+ <finalName>synapse</finalName>
<filters>
<filter>
${basedir}/src/test/resources/synapse-libraries/assembly/filter.properties
@@ -122,7 +122,7 @@
<goal>attached</goal>
</goals>
<configuration>
- <finalName>synapse-eipcore-lib</finalName>
+ <finalName>synapse</finalName>
<filters>
<filter>
${basedir}/src/test/resources/synapse-libraries/assembly/filter.properties
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/libraries/util/LibDeployerUtils.java Sun Jun 5 13:49:40 2016
@@ -434,14 +434,14 @@ public class LibDeployerUtils {
if (entry.getName().startsWith("META-INF/")) {
continue;
}
- // if the entry is a directory, create a new dir
+ // Skip directories
if (entry.isDirectory()) {
- createDir(destPath + entry.getName());
continue;
}
- // if the entry is a file, write the file
+ File dest = new File(destPath, entry.getName());
+ dest.getParentFile().mkdirs();
copyInputStream(zipFile.getInputStream(entry),
- new BufferedOutputStream(new FileOutputStream(destPath + entry.getName())));
+ new BufferedOutputStream(new FileOutputStream(dest)));
}
zipFile.close();
}
Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eipcore-lib.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eipcore-lib.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eipcore-lib.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eipcore-lib.xml Sun Jun 5 13:49:40 2016
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
+ <id>eipcore-lib</id>
<formats>
<format>zip</format>
</formats>
Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eiptest-lib.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eiptest-lib.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eiptest-lib.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-eiptest-lib.xml Sun Jun 5 13:49:40 2016
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
+ <id>eiptest-lib</id>
<formats>
<format>zip</format>
</formats>
Modified: synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-lib.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-lib.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-lib.xml (original)
+++ synapse/trunk/java/modules/core/src/test/resources/synapse-libraries/assembly/assemble-lib.xml Sun Jun 5 13:49:40 2016
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
+ <id>test-lib</id>
<formats>
<format>zip</format>
</formats>
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Sun Jun 5 13:49:40 2016
@@ -185,9 +185,7 @@
<exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>xml-apis:xml-apis:jar</exclude>
<exclude>xerces:xercesImpl:jar</exclude>
- <exclude>org.apache.xerces:xercesImpl</exclude> <!-- Find the source of this -->
- <exclude>org.apache.xerces:xml-apis</exclude>
- <exclude>quickfixj:quickfixj-all:jar</exclude>
+ <exclude>org.quickfixj:quickfixj-*:jar</exclude>
<exclude>org.snmp4j:snmp4j</exclude>
<exclude>org.snmp4j:snmp4j-agent</exclude>
<exclude>com.rabbitmq:amqp-client:jar</exclude>
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1746919&r1=1746918&r2=1746919&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sun Jun 5 13:49:40 2016
@@ -196,7 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -252,8 +252,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <!-- The latest version (2.2.2) has a problem with file permissions -->
- <version>2.2-beta-2</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>