You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2018/06/22 17:16:07 UTC

svn commit: r1834146 - in /felix/trunk: bundlerepository/doc/apache-felix-osgi-bundle-repository_files/ configadmin/src/test/java/org/apache/felix/cm/integration/helper/ framework.security/src/main/appended-resources/META-INF/ framework.security/src/ma...

Author: rotty3000
Date: Fri Jun 22 17:16:06 2018
New Revision: 1834146

URL: http://svn.apache.org/viewvc?rev=1834146&view=rev
Log:
[logback] revert attempted release

Modified:
    felix/trunk/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/   (props changed)
    felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/BaseTestActivator.java   (props changed)
    felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES   (props changed)
    felix/trunk/framework.security/src/main/appended-resources/META-INF/LICENSE   (props changed)
    felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE   (props changed)
    felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/LocalPermissions.java   (props changed)
    felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES   (props changed)
    felix/trunk/framework/src/main/appended-resources/META-INF/LICENSE   (props changed)
    felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE   (props changed)
    felix/trunk/gogo/gogo-parent/LICENSE   (props changed)
    felix/trunk/gogo/gogo-parent/NOTICE   (props changed)
    felix/trunk/gogo/gogo-parent/pom.xml   (props changed)
    felix/trunk/gogo/shell/   (props changed)
    felix/trunk/http/base/   (props changed)
    felix/trunk/http/bridge/   (props changed)
    felix/trunk/http/itest/   (props changed)
    felix/trunk/http/jetty/   (props changed)
    felix/trunk/logback/logback/pom.xml
    felix/trunk/logback/pom.xml
    felix/trunk/main.distribution/doc/apache-felix-gogo-Dateien/   (props changed)
    felix/trunk/main.distribution/doc/apache-felix-gogo.html   (props changed)
    felix/trunk/main/doc/apache-felix-framework-usage-documentation.html   (props changed)
    felix/trunk/main/doc/apache-felix-framework-usage-documentation_files/   (props changed)
    felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES   (props changed)
    felix/trunk/main/src/main/appended-resources/META-INF/LICENSE   (props changed)
    felix/trunk/main/src/main/appended-resources/META-INF/NOTICE   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ReadOnlyDictionary.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/UnbindMethod.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ServiceMetadata.java   (props changed)
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/instances/   (props changed)
    felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/instances2/   (props changed)
    felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java   (props changed)
    felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java   (props changed)
    felix/trunk/webconsole/src/main/compat/res/imgs/component_configure.png   (props changed)

Propchange: felix/trunk/bundlerepository/doc/apache-felix-osgi-bundle-repository_files/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/BaseTestActivator.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework.security/src/main/appended-resources/META-INF/LICENSE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework.security/src/main/java/org/apache/felix/framework/security/util/LocalPermissions.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/LICENSE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/gogo/gogo-parent/LICENSE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/gogo/gogo-parent/NOTICE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/gogo/gogo-parent/pom.xml
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/gogo/shell/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/http/base/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/http/bridge/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/http/itest/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/http/jetty/
            ('svn:mergeinfo' removed)

Modified: felix/trunk/logback/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/pom.xml?rev=1834146&r1=1834145&r2=1834146&view=diff
==============================================================================
--- felix/trunk/logback/logback/pom.xml (original)
+++ felix/trunk/logback/logback/pom.xml Fri Jun 22 17:16:06 2018
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.logback.reactor</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <description>
         A simple integration of the OSGi R7 Log (1.4) service to Logback backend.
     </description>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <artifactId>org.apache.felix.logback</artifactId>
 
     <scm>

Modified: felix/trunk/logback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/pom.xml?rev=1834146&r1=1834145&r2=1834146&view=diff
==============================================================================
--- felix/trunk/logback/pom.xml (original)
+++ felix/trunk/logback/pom.xml Fri Jun 22 17:16:06 2018
@@ -28,7 +28,7 @@
 
     <name>Apache Felix Logback Reactor</name>
     <artifactId>org.apache.felix.logback.reactor</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <scm>

Propchange: felix/trunk/main.distribution/doc/apache-felix-gogo-Dateien/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main.distribution/doc/apache-felix-gogo.html
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main/doc/apache-felix-framework-usage-documentation.html
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main/doc/apache-felix-framework-usage-documentation_files/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/DEPENDENCIES
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/LICENSE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/main/src/main/appended-resources/META-INF/NOTICE
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/ReadOnlyDictionary.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/UnbindMethod.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentContextImpl.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ComponentFactoryImpl.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/PropertyMetadata.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ReferenceMetadata.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ServiceMetadata.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/xml/XmlHandler.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/inject/BindMethodTest.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/inject/methods/ActivateMethodTest.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/ComponentMetadataTest.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/XmlHandlerTest.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/instances/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/scr/src/test/java/org/apache/felix/scr/impl/metadata/instances2/
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
            ('svn:mergeinfo' removed)

Propchange: felix/trunk/webconsole/src/main/compat/res/imgs/component_configure.png
            ('svn:mergeinfo' removed)