You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:16:56 UTC
[sling-org-apache-sling-settings] annotated tag
org.apache.sling.settings-1.3.2 created (now 3a2984a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git.
at 3a2984a (tag)
tagging fa91d571a6879fb7bfeaf47e04212cade0d5af84 (commit)
by Carsten Ziegeler
on Tue Jul 8 15:04:38 2014 +0000
- Log -----------------------------------------------------------------
org.apache.sling.settings-1.3.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new e29b17b SLING-1460 : Move SlingSettingsService to new Settings bundle
new 2f625ec SLING-1651 - Integrate RunMode module into new Settings Module SLING-983 - Add sling.properties file to configuration status page
new fdbf548 SLING-1651 - Integrate RunMode module into new Settings Module SLING-983 - Add sling.properties file to configuration status page
new 02d570e Ignore Eclipse files
new c7ffd13 Don't delete sling id file in engine for compatibility and add a temporary np check
new fee338d Delayed activation if engine bundle is available but not started yet.
new 9381905 Some pom formatting, set export version and make dependencies provided
new d766e1e Add site generation properties and Bundle-DocURL manifest header
new 55a7b4b [maven-release-plugin] prepare release org.apache.sling.settings-1.0.0
new 7374c80 [maven-release-plugin] prepare for next development iteration
new 13ea134 Add README.txt
new 1c24d3b SLING-1835 : Remove direct dependency to web console by using new configuration printer support
new 855b40f [maven-release-plugin] prepare release org.apache.sling.settings-1.0.2
new f8f82be [maven-release-plugin] prepare for next development iteration
new 305e51c updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new dde5897 Update to recent snapshots
new c7bd56b Use latest releases.
new de1d202 SLING-1970 : Potential deadlock during start of settings service
new 9897382 SLING-2089 - adding getAbsolutePathWithinSlingHome() method
new c144627 SLING-2150 : Update plugins to use the latest available versions
new b1b2847 SLING-2155 : Remove check for Sling Engine bundle
new 2614e9f Update to recent snapshot
new 09f8851 Using latest released parent pom
new 8e82fb1 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new e535edf temporarily using snapshots during release vote
new cdf97c6 using latest releases
new 50e68a4 [maven-release-plugin] prepare release org.apache.sling.settings-1.1.0
new a9b604a [maven-release-plugin] prepare for next development iteration
new 73a4d66 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new a10e502 Remove old scr javadoc annotation
new dc197cd Update to latest parent pom
new 8a358ad Use released versions
new 11b3f5c SLING-2662 : Enhance run mode handling
new 4c28623 SLING-2662 : Enhance run mode handling
new bbb8a01 SLING-2662 - more readable tests and some additional ones
new cc7e187 [maven-release-plugin] prepare release org.apache.sling.settings-1.2.0
new f582fe7 [maven-release-plugin] prepare for next development iteration
new 4dc89f8 SLING-2662 - test case with empty run modes string
new 1cb0791 SLING-2673 - close fis stream
new 3ffd484 SLING-2674 - take new run mode options into account when starting on an older Sling instance
new 1ae0f68 SLING-2674: SlingSettingsServiceImpl should detect and handle upgrades
new 7c9f72c Support portals bridge
new 7c677f2 SLING-2674 : SlingSettingsServiceImpl should detect and handle upgrades
new 6f759e5 [maven-release-plugin] prepare release org.apache.sling.settings-1.2.2
new 442e5f4 [maven-release-plugin] prepare for next development iteration
new 63f7ade Use latest releases and update to new parent pom
new 6d4543f Update to latest parent pom and use latest releases in launchpad
new 5cd294c Correct reactor pom and update to parent pom 16
new a3279d2 Update to latest parent pom
new 2395548 SLING-2976 : Add support for instance name and description
new aeb6067 SLING-2976 : Add support for instance name and description
new 2b30ad8 [maven-release-plugin] prepare release org.apache.sling.settings-1.3.0
new 2b35f10 [maven-release-plugin] prepare for next development iteration
new ce2f298 Update to parent pom 18
new a716016 Revert to old maven bundle plugin if DynamicImport-Package is used
new 11b2ccd SLING-3286 - Remove plugin version overrides from poms
new a52cf20 SLING-3286 - Remove plugin version overrides from poms
new 1f53831 Update to parent pom v19
new dac3466 SLING-3737 : Instance Sling Identifier may be randomly reset on restart. Apply patch from Timothee Maret
new 26ab368 [maven-release-plugin] prepare release org.apache.sling.settings-1.3.2
new fa91d57 [maven-release-plugin] copy for tag org.apache.sling.settings-1.3.2
The 61 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-settings] 05/09: SLING-3286 - Remove plugin
version overrides from poms
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit a52cf2002ac2776917f3886a46685e6bab2e4498
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Dec 15 22:06:39 2013 +0000
SLING-3286 - Remove plugin version overrides from poms
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1551066 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index a48a9f1..651ab5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
org.osgi.service.cm
</DynamicImport-Package>
<Import-Package>
+ !org.osgi.service.cm,
org.apache.felix.shell;resolution:=optional,
*
</Import-Package>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 06/09: Update to parent pom v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 1f53831903712387f359eb9994b5c0ee05573085
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 651ab5c..349146e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 03/09: Revert to old maven bundle
plugin if DynamicImport-Package is used
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit a7160167d71d6a112c48cf9a836ac5a195567391
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 15:22:28 2013 +0000
Revert to old maven bundle plugin if DynamicImport-Package is used
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1520595 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index a48a9f1..9a62e2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 01/09: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 2b35f102a3d4e01255d5a6e38ffe02d0dc93e557
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 9 06:51:38 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1512164 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0a0b1c7..a58ee8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<name>Apache Sling Settings</name>
<description>
@@ -38,13 +38,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.3.0
+ scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.3.0
+ scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/tags/org.apache.sling.settings-1.3.0
+ http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 07/09: SLING-3737 : Instance
Sling Identifier may be randomly reset on restart. Apply patch from
Timothee Maret
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit dac34661c10f8a01a2a0347f7dc0bdceef95752d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 8 14:28:35 2014 +0000
SLING-3737 : Instance Sling Identifier may be randomly reset on restart. Apply patch from Timothee Maret
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1608798 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 ++
.../settings/impl/SlingSettingsServiceImpl.java | 59 ++++----
.../impl/SlingSettingsServiceImplTest.java | 156 +++++++++++++++++++++
3 files changed, 199 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 349146e..2a767db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,5 +117,17 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
index 5fadb1e..1281495 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.settings.impl;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -77,6 +79,9 @@ public class SlingSettingsServiceImpl
/** The name of the data file holding install run mode options */
private static final String OPTIONS_FILE = "sling.options.file";
+ /** The length in bytes of a sling identifier */
+ private static final int SLING_ID_LENGTH = 36;
+
/** The properties for name, description. */
private final Map<String, String> slingProps = new HashMap<String, String>();
@@ -124,7 +129,7 @@ public class SlingSettingsServiceImpl
// the osgi framework does not support storing something in the file system
throw new RuntimeException("Unable to read from bundle data file.");
}
- this.slingId = this.readSlingId(idFile);
+ this.slingId = this.readSlingId(idFile, SLING_ID_LENGTH);
// no sling id yet or failure to read file: create an id and store
if (slingId == null) {
@@ -147,7 +152,7 @@ public class SlingSettingsServiceImpl
}
}
- private static final class Options implements Serializable {
+ static final class Options implements Serializable {
private static final long serialVersionUID = 1L;
String[] modes;
String selected;
@@ -263,7 +268,7 @@ public class SlingSettingsServiceImpl
return optionsList;
}
- private void writeOptions(final BundleContext context, final List<Options> optionsList) {
+ void writeOptions(final BundleContext context, final List<Options> optionsList) {
final File file = context.getDataFile(OPTIONS_FILE);
FileOutputStream fos = null;
ObjectOutputStream oos = null;
@@ -286,30 +291,28 @@ public class SlingSettingsServiceImpl
/**
* Read the id from a file.
*/
- private String readSlingId(final File idFile) {
- if (idFile.exists() && idFile.length() >= 36) {
- FileInputStream fin = null;
+ String readSlingId(final File idFile, int maxLength) {
+ if (idFile.exists() && idFile.length() >= maxLength) {
+ DataInputStream dis = null;
try {
- fin = new FileInputStream(idFile);
- final byte[] rawBytes = new byte[36];
- if (fin.read(rawBytes) == 36) {
- final String rawString = new String(rawBytes, "ISO-8859-1");
+ final byte[] rawBytes = new byte[maxLength];
+ dis = new DataInputStream(new FileInputStream(idFile));
+ dis.readFully(rawBytes);
+ final String rawString = new String(rawBytes, "ISO-8859-1");
- // roundtrip to ensure correct format of UUID value
- final String id = UUID.fromString(rawString).toString();
- logger.debug("Got Sling ID {} from file {}", id, idFile);
+ // roundtrip to ensure correct format of UUID value
+ final String id = UUID.fromString(rawString).toString();
+ logger.debug("Got Sling ID {} from file {}", id, idFile);
- return id;
- }
+ return id;
} catch (final Throwable t) {
logger.error("Failed reading UUID from id file " + idFile
+ ", creating new id", t);
} finally {
- if (fin != null) {
+ if (dis != null) {
try {
- fin.close();
- } catch (IOException ignore) {
- }
+ dis.close();
+ } catch (IOException ignore){}
}
}
}
@@ -319,22 +322,22 @@ public class SlingSettingsServiceImpl
/**
* Write the sling id file.
*/
- private void writeSlingId(final File idFile, final String id) {
+ void writeSlingId(final File idFile, final String id) {
idFile.delete();
idFile.getParentFile().mkdirs();
- FileOutputStream fout = null;
+ DataOutputStream dos = null;
try {
- fout = new FileOutputStream(idFile);
- fout.write(slingId.getBytes("ISO-8859-1"));
- fout.flush();
+ final byte[] rawBytes = id.getBytes("ISO-8859-1");
+ dos = new DataOutputStream(new FileOutputStream(idFile));
+ dos.write(rawBytes, 0, rawBytes.length);
+ dos.flush();
} catch (final Throwable t) {
logger.error("Failed writing UUID to id file " + idFile, t);
} finally {
- if (fout != null) {
+ if (dos != null) {
try {
- fout.close();
- } catch (IOException ignore) {
- }
+ dos.close();
+ } catch (IOException ignore) {}
}
}
}
diff --git a/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java b/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
new file mode 100644
index 0000000..81e3dd1
--- /dev/null
+++ b/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.settings.impl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.apache.sling.launchpad.api.StartupHandler;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.osgi.framework.BundleContext;
+
+public class SlingSettingsServiceImplTest {
+
+ private static final String SLING_ID_FILE_NAME = "sling.id.file";
+
+ private static final String OPTIONS_FILE_NAME = "sling.options.file";
+
+ private static final String SLING_ID = "097bae9b-bf60-45a2-ad8c-ccdd374dd9b0";
+
+ private File slingIdFile = null;
+
+ private File optionsFile = null;
+
+ @Before
+ public void before() throws IOException {
+ slingIdFile = File.createTempFile(
+ SLING_ID_FILE_NAME, "");
+ optionsFile = File.createTempFile(
+ OPTIONS_FILE_NAME, "");
+ }
+
+ @After
+ public void after() throws IOException {
+ if (slingIdFile != null ) {
+ slingIdFile.delete();
+ slingIdFile = null;
+ }
+ if (optionsFile != null) {
+ optionsFile.delete();
+ optionsFile = null;
+ }
+ }
+
+ @Test
+ public void testGenerateSlingId()
+ throws IOException {
+ String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ Assert.assertNotNull(slingId);
+ }
+
+ @Test
+ public void testGetSlingId()
+ throws IOException {
+ writeSlingId(slingIdFile, optionsFile, SLING_ID);
+ String generated = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ Assert.assertNotNull(generated);
+ Assert.assertEquals(SLING_ID, generated);
+ String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ Assert.assertNotNull(slingId);
+ Assert.assertEquals(generated, slingId);
+ }
+
+ @Test
+ public void testGetLongSlingIdFromTooLargeData()
+ throws IOException {
+ String data = SLING_ID + RandomStringUtils.randomAscii(1024 * 1024); // 1MB long random String
+ writeSlingId(slingIdFile, optionsFile, data);
+ String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ Assert.assertNotNull(slingId);
+ Assert.assertEquals(SLING_ID, slingId);
+ }
+
+ @Test
+ public void testGetSlingIdFromTooShortData()
+ throws IOException {
+ String data = RandomStringUtils.randomAscii(8); // 8 byte long string
+ writeSlingId(slingIdFile, optionsFile, data);
+ String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ Assert.assertNotNull(slingId);
+ Assert.assertNotEquals(SLING_ID, slingId);
+ }
+
+ private String readSlingId(File slingIdFile, File optionsFile, int maxLength)
+ throws IOException {
+ SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
+ return settings.readSlingId(slingIdFile, maxLength);
+ }
+
+ private void writeSlingId(File slingIdFile, File optionsFile, String slingId)
+ throws IOException {
+ SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
+ settings.writeSlingId(slingIdFile, slingId);
+ }
+
+ private SlingSettingsServiceImpl getSlingSettings(File slingIdFile, File optionsFile)
+ throws IOException {
+ BundleContext context = Mockito.mock(BundleContext.class);
+ Mockito.when(context.getDataFile(SLING_ID_FILE_NAME))
+ .thenReturn(slingIdFile);
+ Mockito.when(context.getDataFile(OPTIONS_FILE_NAME))
+ .thenReturn(optionsFile);
+ StartupHandler handler = Mockito.mock(StartupHandler.class);
+ // write options
+ List<SlingSettingsServiceImpl.Options> options = new ArrayList<SlingSettingsServiceImpl.Options>();
+ FileOutputStream fos = null;
+ ObjectOutputStream oos = null;
+ try {
+ fos = new FileOutputStream(optionsFile);
+ oos = new ObjectOutputStream(fos);
+ oos.writeObject(options);
+ } catch ( final IOException ioe ) {
+ throw new RuntimeException("Unable to write to options data file.", ioe);
+ } finally {
+ if ( oos != null ) {
+ try {
+ oos.close();
+ } catch (IOException ignore) {
+ // ...
+ }
+ }
+ if ( fos != null ) {
+ try {
+ fos.close();
+ } catch (IOException ignore) {
+ // ...
+ }
+ }
+ }
+ return new SlingSettingsServiceImpl(context, handler);
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 08/09: [maven-release-plugin]
prepare release org.apache.sling.settings-1.3.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 26ab3681e5a6498f69bf2c35be4c757abf8970ff
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 8 15:04:17 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.settings-1.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1608820 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a767db..d8d5aa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2</version>
<name>Apache Sling Settings</name>
<description>
@@ -38,13 +38,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.3.2
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.3.2
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings
+ http://svn.apache.org/viewvc/sling/tags/org.apache.sling.settings-1.3.2
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 09/09: [maven-release-plugin]
copy for tag org.apache.sling.settings-1.3.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit fa91d571a6879fb7bfeaf47e04212cade0d5af84
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 8 15:04:38 2014 +0000
[maven-release-plugin] copy for tag org.apache.sling.settings-1.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.3.2@1608821 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 02/09: Update to parent pom 18
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit ce2f298d70499eec6315daef80b9ed3e01c6c70f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a58ee8e..a48a9f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 04/09: SLING-3286 - Remove plugin
version overrides from poms
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 11b2ccd3458125bb962bbd3a36cc0dd1f64846fe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Sun Dec 15 21:28:32 2013 +0000
SLING-3286 - Remove plugin version overrides from poms
Remove most plugin version overrides. Still left in:
- a couple of projects where upgrading to the maven-bundle-plugins
leads to errors (TODOs added)
- a couple of projects where the plugin version is newer than the
one from the parent project ( comments added )
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1551060 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9a62e2c..a48a9f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.