You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sling.apache.org by Robert Munteanu <ro...@apache.org> on 2015/06/03 16:03:55 UTC
Re: svn commit: r1683326 -
/sling/trunk/contrib/scripting/java/pom.xml
Hi Olli,
It would be good if you separated the formatting changes from the
meaningful ones; for this (small) commit I have no idea what has
changed.
Thanks,
Robert
On Wed, 2015-06-03 at 13:33 +0000, olli@apache.org wrote:
> Author: olli
> Date: Wed Jun 3 13:33:57 2015
> New Revision: 1683326
>
> URL: http://svn.apache.org/r1683326
> Log:
> SLING-4700 remove javax.inject from org.apache.sling.scripting.java
>
> Modified:
> sling/trunk/contrib/scripting/java/pom.xml
>
> Modified: sling/trunk/contrib/scripting/java/pom.xml
> URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/
> pom.xml?rev=1683326&r1=1683325&r2=1683326&view=diff
> =====================================================================
> =========
> --- sling/trunk/contrib/scripting/java/pom.xml (original)
> +++ sling/trunk/contrib/scripting/java/pom.xml Wed Jun 3 13:33:57
> 2015
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="ISO-8859-1"?>
> +<?xml version="1.0" encoding="UTF-8"?>
> <!--
> Licensed to the Apache Software Foundation (ASF) under one
> or more contributor license agreements. See the NOTICE file
> @@ -7,9 +7,9 @@
> 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
> @@ -17,127 +17,132 @@
> specific language governing permissions and limitations
> under the License.
> -->
> -<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">;
> +<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/xsd/maven-4.0.0.xsd">;
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <parent>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>sling</artifactId>
> + <version>22</version>
> + <relativePath/>
> + </parent>
> +
> + <artifactId>org.apache.sling.scripting.java</artifactId>
> + <version>2.0.11-SNAPSHOT</version>
> + <packaging>bundle</packaging>
> +
> + <name>Apache Sling Scripting Java Support</name>
> + <description>Support for scripting Java</description>
> +
> + <scm>
> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/
> contrib/scripting/java</connection>;
> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sl
> ing/trunk/contrib/scripting/java</developerConnection>;
> + <url>
> http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java</url>
> ;
> + </scm>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-scr-plugin</artifactId>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> + <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
> + <ScriptEngine-Version>${project.version}</ScriptEngine
> -Version>
> + </instructions>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> + <reporting>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-javadoc-plugin</artifactId>
> + <configuration>
> + <!-- No javadocs -->
> + <excludePackageNames>
> + org.apache.sling.scripting.java.impl
> + </excludePackageNames>
> + </configuration>
> + </plugin>
> + </plugins>
> + </reporting>
> +
> + <dependencies>
> + <!-- javax -->
> + <dependency>
> + <groupId>javax.inject</groupId>
> + <artifactId>javax.inject</artifactId>
> + <version>1</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.servlet</groupId>
> + <artifactId>servlet-api</artifactId>
> + <version>2.5</version>
> + <scope>provided</scope>
> + </dependency>
> + <!-- OSGi -->
> + <dependency>
> + <groupId>org.osgi</groupId>
> + <artifactId>org.osgi.core</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.osgi</groupId>
> + <artifactId>org.osgi.compendium</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <!-- Apache Sling -->
> + <dependency>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>org.apache.sling.api</artifactId>
> + <version>2.0.8</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>org.apache.sling.scripting.api</artifactId>
> + <version>2.1.0</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>org.apache.sling.commons.compiler</artifactId>
> + <version>2.1.0</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>org.apache.sling.commons.classloader</artifactId>
> + <version>1.2.0</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.sling</groupId>
> + <artifactId>org.apache.sling.commons.osgi</artifactId>
> + <version>2.2.0</version>
> + <scope>provided</scope>
> + </dependency>
> + <!-- Apache Felix -->
> + <dependency>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>org.apache.felix.scr.annotations</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <!-- logging -->
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + </dependencies>
>
> - <modelVersion>4.0.0</modelVersion>
> - <parent>
> - <groupId>org.apache.sling</groupId>
> - <artifactId>sling</artifactId>
> - <version>22</version>
> - <relativePath/>
> - </parent>
> -
> - <artifactId>org.apache.sling.scripting.java</artifactId>
> - <version>2.0.13-SNAPSHOT</version>
> - <packaging>bundle</packaging>
> -
> - <name>Apache Sling Scripting Java Support</name>
> - <description>Support for scripting Java</description>
> -
> - <scm>
> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tr
> unk/contrib/scripting/java</connection>;
> - <developerConnection>scm:svn:https://svn.apache.org/repos/as
> f/sling/trunk/contrib/scripting/java</developerConnection>;
> - <url>
> http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java</url>
> ;
> - </scm>
> -
> - <build>
> - <plugins>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-scr-plugin</artifactId>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <extensions>true</extensions>
> - <configuration>
> - <instructions>
> - <Private-Package>
> - org.apache.sling.scripting.java.impl
> - </Private-Package>
> - <ScriptEngine
> -Name>${project.name}</ScriptEngine-Name>
> - <ScriptEngine
> -Version>${project.version}</ScriptEngine-Version>
> - <Export
> -Package>javax.inject;version=0</Export-Package>
> - </instructions>
> - </configuration>
> - </plugin>
> - </plugins>
> - </build>
> - <reporting>
> - <plugins>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-javadoc-plugin</artifactId>
> - <configuration>
> - <!-- No javadocs -->
> - <excludePackageNames>
> - org.apache.sling.scripting.java.impl
> - </excludePackageNames>
> - </configuration>
> - </plugin>
> - </plugins>
> - </reporting>
> -
> - <dependencies>
> - <dependency>
> - <groupId>org.osgi</groupId>
> - <artifactId>org.osgi.core</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.osgi</groupId>
> - <artifactId>org.osgi.compendium</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.felix</groupId>
> -
> <artifactId>org.apache.felix.scr.annotations</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> - <artifactId>org.apache.sling.api</artifactId>
> - <version>2.0.8</version>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> - <artifactId>org.apache.sling.scripting.api</artifactId>
> - <version>2.0.2-incubator</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> -
> <artifactId>org.apache.sling.commons.compiler</artifactId>
> - <version>2.1.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> - <artifactId>org.apache.sling.commons.osgi</artifactI
> d>
> - <version>2.2.0</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.sling</groupId>
> -
> <artifactId>org.apache.sling.commons.classloader</artifactId>
> - <version>1.2.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>javax.servlet</groupId>
> - <artifactId>servlet-api</artifactId>
> - <version>2.5</version>
> - <scope>provided</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-api</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>javax.inject</groupId>
> - <artifactId>javax.inject</artifactId>
> - <version>1</version>
> - </dependency>
> - </dependencies>
> </project>
>
>
Re: Re: svn commit: r1683326 -
/sling/trunk/contrib/scripting/java/pom.xml
Posted by Robert Munteanu <ro...@apache.org>.
On Wed, 2015-06-03 at 16:34 +0200, Oliver Lietz wrote:
> On Wednesday 03 June 2015 17:03:55 Robert Munteanu wrote:
> > Hi Olli,
> >
> > It would be good if you separated the formatting changes from the
> > meaningful ones; for this (small) commit I have no idea what has
> > changed.
>
> for sure - I totally f*cked up this commit (reverted and committed
> again).
>
> Thanks for pointing out.
Cool, thanks :-)
Robert
>
> O.
>
> > Thanks,
> >
> > Robert
>
>
Re: Re: svn commit: r1683326 - /sling/trunk/contrib/scripting/java/pom.xml
Posted by Oliver Lietz <ap...@oliverlietz.de>.
On Wednesday 03 June 2015 17:03:55 Robert Munteanu wrote:
> Hi Olli,
>
> It would be good if you separated the formatting changes from the
> meaningful ones; for this (small) commit I have no idea what has
> changed.
for sure - I totally f*cked up this commit (reverted and committed again).
Thanks for pointing out.
O.
> Thanks,
>
> Robert