This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-content.git
commit 12b99c008766917de5f9889e4541df023914a395 Author: David Bosschaert <[email protected]> AuthorDate: Fri Feb 1 16:54:19 2019 +0000 Update Feature and Feature IO dependencies to 1.0.0 Also remove the dependency-reduced-pom.xml as it is a generated artifact. --- dependency-reduced-pom.xml | 154 --------------------------------------------- pom.xml | 4 +- 2 files changed, 2 insertions(+), 156 deletions(-) diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index 5c9b2a8..0000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,154 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <parent> - <artifactId>sling</artifactId> - <groupId>org.apache.sling</groupId> - <version>34</version> - <relativePath>pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.sling.feature.extension.content</artifactId> - <name>Sling Featuremodel - Content Deployment Exension</name> - <version>0.0.1-SNAPSHOT</version> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - </license> - </licenses> - <scm> - <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-content.git</connection> - <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-content.git</developerConnection> - <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-extension-content.git</url> - </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <minimizeJar>true</minimizeJar> - <filters> - <filter> - <includes> - <include>org.apache.commons:collections:*</include> - </includes> - </filter> - </filters> - <relocations> - <relocation> - <pattern>javax.jcr</pattern> - <shadedPattern>shaded.javax.jcr</shadedPattern> - <includes> - <include>javax.jcr.**</include> - </includes> - </relocation> - <relocation> - <pattern>org.slf4j</pattern> - <shadedPattern>shaded.org.slf4j</shadedPattern> - <includes> - <include>org.slf4j.**</include> - </includes> - </relocation> - <relocation> - <pattern>org.osgi</pattern> - <shadedPattern>shaded.org.osgi</shadedPattern> - <includes> - <include>org.osgi.util.**</include> - </includes> - </relocation> - <relocation> - <pattern>org.apache</pattern> - <shadedPattern>shaded.org.apache</shadedPattern> - <excludes> - <exclude>org.apache.sling.feature.**</exclude> - </excludes> - </relocation> - <relocation> - <pattern>org.UNSHADE.apache</pattern> - <shadedPattern>org.apache</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/main/resources/META-INF/services/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.feature</artifactId> - <version>0.8.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.feature.io</artifactId> - <version>0.8.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.feature.launcher</artifactId> - <version>0.8.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>hamcrest-core</artifactId> - <groupId>org.hamcrest</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.23.0</version> - <scope>test</scope> - <exclusions> - <exclusion> - <artifactId>byte-buddy</artifactId> - <groupId>net.bytebuddy</groupId> - </exclusion> - <exclusion> - <artifactId>byte-buddy-agent</artifactId> - <groupId>net.bytebuddy</groupId> - </exclusion> - <exclusion> - <artifactId>objenesis</artifactId> - <groupId>org.objenesis</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <properties> - <surefire.plugin.version>3.0.0-M3</surefire.plugin.version> - <jdk.version>8</jdk.version> - </properties> -</project> diff --git a/pom.xml b/pom.xml index 713db08..8deda51 100644 --- a/pom.xml +++ b/pom.xml @@ -128,13 +128,13 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.feature</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.feature.io</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>1.0.0</version> <scope>provided</scope> </dependency> <dependency>
