Author: cschneider Date: Tue Jan 10 15:50:23 2017 New Revision: 1778145 URL: http://svn.apache.org/viewvc?rev=1778145&view=rev Log: [ARIES-1656] Remove dependency to aries utils
Removed: aries/trunk/proxy/proxy-api/src/main/resources/org/apache/aries/proxy/nls/ProxyMessages.properties Modified: aries/trunk/proxy/proxy-api/pom.xml aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/FinalModifierException.java 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/proxy-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1778145&r1=1778144&r2=1778145&view=diff ============================================================================== --- aries/trunk/proxy/proxy-api/pom.xml (original) +++ aries/trunk/proxy/proxy-api/pom.xml Tue Jan 10 15:50:23 2017 @@ -32,7 +32,7 @@ <artifactId>org.apache.aries.proxy.api</artifactId> <packaging>bundle</packaging> <name>Apache Aries Proxy API</name> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <description> This bundle contains the Apache Aries Proxy service API. </description> @@ -58,7 +58,11 @@ * </aries.osgi.import.pkg> <aries.osgi.private.pkg /> - <lastReleaseVersion>1.0.0</lastReleaseVersion> + <lastReleaseVersion>1.0.1</lastReleaseVersion> + + <!-- Skip version check for release 1.1.0 as the plugin does not handle the case + of removing a dpendency correctly --> + <aries.skip.version.check>true</aries.skip.version.check> </properties> <dependencies> @@ -67,11 +71,6 @@ <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>1.0.0</version> - </dependency> </dependencies> <build> Modified: aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/FinalModifierException.java URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/FinalModifierException.java?rev=1778145&r1=1778144&r2=1778145&view=diff ============================================================================== --- aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/FinalModifierException.java (original) +++ aries/trunk/proxy/proxy-api/src/main/java/org/apache/aries/proxy/FinalModifierException.java Tue Jan 10 15:50:23 2017 @@ -18,8 +18,6 @@ */ package org.apache.aries.proxy; -import org.apache.aries.util.nls.MessageUtil; - public class FinalModifierException extends UnableToProxyException { @@ -28,7 +26,6 @@ public class FinalModifierException exte * */ private static final long serialVersionUID = -3139392096074404448L; - private static final MessageUtil MESSAGES = MessageUtil.createMessageUtil(FinalModifierException.class, "org.apache.aries.proxy.nls.ProxyMessages"); private String finalMethods = null; public FinalModifierException(Class<?> clazz) @@ -55,9 +52,9 @@ public class FinalModifierException exte public String getMessage() { if (isFinalClass()) { - return MESSAGES.getMessage("final.class", getClassName()); + return String.format("The class %s is final.", getClassName()); } else { - return MESSAGES.getMessage("final.methods", finalMethods, getClassName()); + return String.format("The methods %s in class %s are final.", finalMethods, getClassName()); } } } \ No newline at end of file Modified: aries/trunk/proxy/proxy-bundle/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-bundle/pom.xml?rev=1778145&r1=1778144&r2=1778145&view=diff ============================================================================== --- aries/trunk/proxy/proxy-bundle/pom.xml (original) +++ aries/trunk/proxy/proxy-bundle/pom.xml Tue Jan 10 15:50:23 2017 @@ -73,13 +73,13 @@ <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.api</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.7-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: aries/trunk/proxy/proxy-impl/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1778145&r1=1778144&r2=1778145&view=diff ============================================================================== --- aries/trunk/proxy/proxy-impl/pom.xml (original) +++ aries/trunk/proxy/proxy-impl/pom.xml Tue Jan 10 15:50:23 2017 @@ -76,6 +76,11 @@ <dependencies> <dependency> + <groupId>org.apache.aries.proxy</groupId> + <artifactId>org.apache.aries.proxy.api</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-debug-all</artifactId> <optional>true</optional> @@ -87,17 +92,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> @@ -105,6 +103,11 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -115,11 +118,6 @@ <version>1.0.0</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy.api</artifactId> - <version>1.0.0</version> - </dependency> </dependencies> <build> @@ -127,7 +125,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -152,50 +149,6 @@ </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.6,)</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> Modified: aries/trunk/proxy/proxy-itests/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-itests/pom.xml?rev=1778145&r1=1778144&r2=1778145&view=diff ============================================================================== --- aries/trunk/proxy/proxy-itests/pom.xml (original) +++ aries/trunk/proxy/proxy-itests/pom.xml Tue Jan 10 15:50:23 2017 @@ -75,7 +75,7 @@ <groupId>org.apache.aries.proxy</groupId> <artifactId>org.apache.aries.proxy.impl</artifactId> <scope>test</scope> - <version>1.0.6-SNAPSHOT</version> + <version>1.0.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.aries</groupId>