Skip to content

Dependencies for 6.1 Updated #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dependencies for 6.1 Updated #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65d4730
Dependency Issues Solved
Jul 13, 2017
862d49f
Tabs/Whitespace fix
Jul 13, 2017
5d84527
More code cleanup
Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/net/adamcin/recap/impl/servlet/RecapCopyServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
*/
@SlingServlet(paths = {RecapConstants.SERVLET_COPY_PATH})
public class RecapCopyServlet extends SlingAllMethodsServlet {
private static final long serialVersionUID = 1L;
private static final Logger LOGGER = LoggerFactory.getLogger(RecapCopyServlet.class);

@Override
Expand Down
11 changes: 2 additions & 9 deletions graniteui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
<embedBundles>
<bundle>net.adamcin.recap.core</bundle>
<bundle>net.adamcin.recap.addressbook</bundle>
<!--<bundle>net.adamcin.recap.replication</bundle>-->
</embedBundles>
<jcrPath>/libs/recap</jcrPath>
<properties>
Expand All @@ -82,7 +81,7 @@
<providerName>Mark Adamcin</providerName>
<providerUrl>http://adamcin.net/</providerUrl>
<providerLink>http://adamcin.net/net.adamcin.recap</providerLink>
<testedWith>AEM 6.0</testedWith>
<testedWith>AEM 6.1</testedWith>
</definitionProperties>
<thumbnail>src/site/resources/images/recap_package_thumbnail.png</thumbnail>
<screenshots>
Expand Down Expand Up @@ -202,13 +201,7 @@
<artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
<version>2.1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.adobe.granite</groupId>
<artifactId>com.adobe.granite.ui.commons</artifactId>
<version>5.5.76</version>
<scope>provided</scope>
</dependency>
</dependency>

<dependency>
<groupId>net.adamcin.commons</groupId>
Expand Down
16 changes: 6 additions & 10 deletions graniteui/src/main/content/jcr_root/components/recap/recap.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%@page import="net.adamcin.recap.addressbook.AddressBookConstants"%>
<%@ page import="net.adamcin.recap.addressbook.AddressBookConstants" %>
<%@ page import="com.day.cq.widget.HtmlLibraryManager" %>
<%@ page import="net.adamcin.recap.addressbook.AddressBook" %>
<%--
Expand Down Expand Up @@ -30,11 +30,11 @@

<%--
Recap Console component.
--%><%
%><%@page session="false" %><%
%><%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %><%
%><sling:defineObjects /><%
%><%
--%>
<%@page session="false" %>
<%@taglib prefix="sling" uri="http://sling.apache.org/taglibs/sling/1.0" %>
<sling:defineObjects />
<%
AddressBook addressBook = resourceResolver.adaptTo(AddressBook.class);
if (addressBook != null) {
pageContext.setAttribute("addressBookPath", addressBook.getResource().getPath());
Expand All @@ -51,10 +51,6 @@
HtmlLibraryManager htmlMgr = sling.getService(HtmlLibraryManager.class);
if (htmlMgr != null) {
htmlMgr.writeIncludes(slingRequest, out, "recap");
/*
if (htmlMgr.getLibraries().containsKey("granite.ui.legacy")) {
}
*/
}
%>
<script>
Expand Down
28 changes: 20 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@

<properties>
<encoding>UTF-8</encoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<slf4j.version>1.6.1</slf4j.version>
<junit.version>4.8.2</junit.version>
<mockito.version>1.8.4</mockito.version>
<maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
<maven.bundle.plugin.version>2.5.3</maven.bundle.plugin.version>
<maven.scr.plugin.version>1.22.0</maven.scr.plugin.version>
<scr.annotations.version>1.9.0</scr.annotations.version>
<scr.generator.version>1.14.0</scr.generator.version>
Expand Down Expand Up @@ -215,25 +215,28 @@
</plugins>
</build>

<profiles>
<profiles>
<!-- ====================================================== -->
<!-- A D O B E P U B L I C P R O F I L E -->
<!-- ====================================================== -->
<profile>
<id>adobe-public</id>

<activation>
<activeByDefault>false</activeByDefault>
<activeByDefault>true</activeByDefault>
</activation>

<properties>
<releaseRepository-Id>adobe-public-releases</releaseRepository-Id>
<releaseRepository-Name>Adobe Public Releases</releaseRepository-Name>
<releaseRepository-URL>http://repo.adobe.com/nexus/content/groups/public</releaseRepository-URL>
<releaseRepository-URL>https://repo.adobe.com/nexus/content/groups/public</releaseRepository-URL>
</properties>

<repositories>
<repository>
<id>adobe-public-releases</id>
<name>Adobe Public Repository</name>
<url>http://repo.adobe.com/nexus/content/groups/public</url>
<url>https://repo.adobe.com/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
Expand All @@ -248,7 +251,7 @@
<pluginRepository>
<id>adobe-public-releases</id>
<name>Adobe Public Repository</name>
<url>http://repo.adobe.com/nexus/content/groups/public</url>
<url>https://repo.adobe.com/nexus/content/groups/public</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
Expand Down Expand Up @@ -307,6 +310,15 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<!-- AEM6.1 dependency -->
<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>uber-jar</artifactId>
<version>6.1.0-SP2</version>
<classifier>obfuscated-apis</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.sling</groupId>
Expand Down
18 changes: 5 additions & 13 deletions replication/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@
</build>

<dependencies>
<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>uber-jar</artifactId>
<classifier>obfuscated-apis</classifier>
</dependency>
<dependency>
<groupId>net.adamcin.recap</groupId>
<artifactId>net.adamcin.recap.core</artifactId>
Expand Down Expand Up @@ -159,19 +164,6 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
</dependency>
<dependency>
<groupId>com.adobe.aem</groupId>
<artifactId>aem-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>com.adobe.granite</groupId>
<artifactId>com.adobe.granite.replication.core</artifactId>
<version>5.5.16</version>
</dependency>
-->

<dependency>
<groupId>junit</groupId>
Expand Down