Skip to content

Commit

Permalink
update build plugins
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <[email protected]>
  • Loading branch information
lukasj committed May 11, 2023
1 parent 799fd13 commit 21b67e0
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 16 deletions.
14 changes: 13 additions & 1 deletion bundles/jakarta.json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,18 @@
</sources>
</configuration>
</execution>
<execution>
<id>current-year-property</id>
<goals>
<goal>timestamp-property</goal>
</goals>
<phase>validate</phase>
<configuration>
<name>current.year</name>
<locale>en,US</locale>
<pattern>yyyy</pattern>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -194,7 +206,7 @@
<header><![CDATA[<br>JSON Processing API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:[email protected]">[email protected]</a>.<br>
Copyright &#169; 2019, 2023 Eclipse Foundation. All rights reserved.<br>
Copyright &#169; 2019, ${current.year} Eclipse Foundation. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
</bottom>
</configuration>
Expand Down
5 changes: 4 additions & 1 deletion impl/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -14,6 +14,9 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

/**
* Jakarta JSON API with Eclipse Parsson implementation.
*/
module org.eclipse.parsson {
requires transitive jakarta.json;
exports org.eclipse.parsson.api;
Expand Down
23 changes: 11 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<spotbugs.exclude>${config.dir}/exclude.xml</spotbugs.exclude>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotbugs.version>4.7.1.0</spotbugs.version>
<spotbugs.version>4.7.3.4</spotbugs.version>

<jakarta.json-api.version>2.1.1</jakarta.json-api.version>

Expand Down Expand Up @@ -193,7 +193,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>9</release>
<!-- Workaround to compile package-info with JDK8 -->
<!-- Workaround to compile package-info with JDK8 -->
<createMissingPackageInfoClass>false</createMissingPackageInfoClass>
<compilerArgs>
<arg>-Xlint:all</arg>
Expand All @@ -207,7 +207,6 @@
</goals>
<configuration>
<release>8</release>
<createMissingPackageInfoClass>true</createMissingPackageInfoClass>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
Expand Down Expand Up @@ -283,7 +282,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.3.0</version>
</plugin>

<plugin>
Expand All @@ -309,7 +308,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.7</version>
<version>5.1.8</version>
<configuration>
<niceManifest>true</niceManifest>
<instructions>
Expand All @@ -325,7 +324,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -335,22 +334,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -370,12 +369,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
5 changes: 4 additions & 1 deletion rest/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -14,6 +14,9 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

/**
* Provides integration with Jakarta REST framework.
*/
module org.eclipse.parsson.media {

requires jakarta.json;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -55,6 +55,11 @@ public class JsonValueBodyWriter implements MessageBodyWriter<JsonValue> {

private final Configuration config;

/**
* Constructor.
*
* @param config configuration
*/
public JsonValueBodyWriter(@Context Configuration config) {
this.config = config;
}
Expand Down

0 comments on commit 21b67e0

Please sign in to comment.