You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/02/27 15:20:57 UTC
[sling-org-apache-sling-commons-johnzon] branch
feature/upgrade-to-johnzon-123 updated (6b69308 -> bff86bf)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/upgrade-to-johnzon-123
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-johnzon.git.
discard 6b69308 SLING-9163 upgrade to Johnzon 1.2.3
new bff86bf SLING-9163 upgrade to Johnzon 1.2.3
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6b69308)
\
N -- N -- N refs/heads/feature/upgrade-to-johnzon-123 (bff86bf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
pom.xml | 1 +
1 file changed, 1 insertion(+)
[sling-org-apache-sling-commons-johnzon] 01/01: SLING-9163 upgrade
to Johnzon 1.2.3
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/upgrade-to-johnzon-123
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-johnzon.git
commit bff86bfc6595905c337023469eafcd3f3e64a5da
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Feb 27 16:14:01 2020 +0100
SLING-9163 upgrade to Johnzon 1.2.3
only that version is fully JSON-P 1.1 compliant
also upgrade to parent 38
---
pom.xml | 71 +++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 40 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1713593..a987e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 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
+<!-- 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. -->
-<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
- <relativePath />
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>38</version>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.commons.johnzon</artifactId>
- <packaging>bundle</packaging>
<version>1.1.3-SNAPSHOT</version>
<name>Apache Sling Commons Johnzon Wrapper Library</name>
@@ -30,24 +30,26 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-johnzon.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-johnzon.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-johnzon.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- javax.json.*;-split-package:=first
- </Export-Package>
- <Private-Package>org.apache.johnzon.core</Private-Package>
- <Import-Package />
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <configuration>
+ <bnd><![CDATA[
+Export-Package: javax.json.*;-split-package:=first
+Private-Package: org.apache.johnzon.core
+Import-Package:
+ ]]></bnd>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -61,16 +63,23 @@
</build>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.1.1</version>
+ <version>1.2.3</version>
<scope>provided</scope>
</dependency>
+ <!-- OSGi annotations (OSGi R7) -->
+ <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/versioning/package-frame.html -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>