Skip to content

Commit

Permalink
fix osgi imports in the bundle,
Browse files Browse the repository at this point in the history 
update build plugins
remove obsolete plugin configs

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Jul 20, 2022
1 parent bd44923 commit bf8a7fc
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 159 deletions.
28 changes: 5 additions & 23 deletions bundles/jakarta.json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,29 +107,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>fix-default-provider</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<replace file="${project.build.directory}/generated-sources/dependencies/jakarta/json/spi/JsonProvider.java">
<replacefilter>
<replacetoken><![CDATA[org.eclipse.jsonp.JsonProviderImpl]]></replacetoken>
<replacevalue><![CDATA[org.eclipse.parsson.JsonProviderImpl]]></replacevalue>
</replacefilter>
</replace>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
<artifactId>spec-version-maven-plugin</artifactId>
Expand Down Expand Up @@ -176,7 +153,12 @@
<Implementation-Version>${spec.implementation.version}</Implementation-Version>
<Specification-Vendor>Eclipse Foundation</Specification-Vendor>
<Specification-Version>${spec.specification.version}</Specification-Version>
<DynamicImport-Package>*</DynamicImport-Package>
<Export-Package>!org.eclipse.parsson,*</Export-Package>
<Import-Package>
org.glassfish.hk2.osgiresourcelocator;resolution:=optional,
*
</Import-Package>
</instructions>
</configuration>
</execution>
Expand Down
36 changes: 1 addition & 35 deletions demos/facebook/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<!--
<main.class>org.eclipse.parsson.demos.facebook.FacebookStreamSearch</main.class>
-->
<modules.directory>${project.build.directory}/modules</modules.directory>
</properties>

<dependencies>
Expand All @@ -40,47 +39,14 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<stripVersion>true</stripVersion>
<outputDirectory>${modules.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>get-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
<execution>
<id>get-project-artifact</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>java</executable>
<arguments>
<argument>--module-path</argument>
<argument>${modules.directory}</argument>
<modulepath/>
<argument>-m</argument>
<argument>org.eclipse.parsson.demos.facebook/${main.class}</argument>
</arguments>
Expand Down
36 changes: 1 addition & 35 deletions demos/jsonpointer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

<properties>
<main.class>org.eclipse.parsson.demos.jsonpointer.JsonpointerDemo</main.class>
<modules.directory>${project.build.directory}/modules</modules.directory>
</properties>

<dependencies>
Expand All @@ -49,47 +48,14 @@
<detectOfflineLinks>false</detectOfflineLinks>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<stripVersion>true</stripVersion>
<outputDirectory>${modules.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>get-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
<execution>
<id>get-project-artifact</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>java</executable>
<arguments>
<argument>--module-path</argument>
<argument>${modules.directory}</argument>
<modulepath/>
<argument>-m</argument>
<argument>org.eclipse.parsson.demos.jsonpointer/${main.class}</argument>
</arguments>
Expand Down
38 changes: 1 addition & 37 deletions demos/twitter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,50 +55,14 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<stripVersion>true</stripVersion>
<outputDirectory>${modules.directory}</outputDirectory>
</configuration>
<executions>
<execution>
<id>get-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<excludeArtifactIds>jakarta.activation-api</excludeArtifactIds>
</configuration>
</execution>
<execution>
<id>get-project-artifact</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<executable>java</executable>
<arguments>
<argument>--module-path</argument>
<argument>${modules.directory}</argument>
<modulepath/>
<argument>-m</argument>
<argument>org.eclipse.parsson.demos.twitter/${main.class}</argument>
</arguments>
Expand Down
46 changes: 17 additions & 29 deletions pom.xml
View file
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.2.2</spotbugs.version>
<spotbugs.version>4.7.1.0</spotbugs.version>

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

Expand Down Expand Up @@ -228,14 +228,6 @@
<ignoreYear>${copyright.ignoreyear}</ignoreYear>
<quiet>false</quiet>
</configuration>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -288,17 +280,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.commonjava.maven.plugins</groupId>
<artifactId>directory-maven-plugin</artifactId>
<version>0.3.1</version>
<version>3.1.0</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
Expand All @@ -318,7 +306,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.2</version>
<version>5.1.7</version>
<configuration>
<niceManifest>true</niceManifest>
<instructions>
Expand All @@ -329,12 +317,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -344,17 +332,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -364,27 +352,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
<version>3.12.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -480,7 +468,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
Expand All @@ -493,7 +481,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down

0 comments on commit bf8a7fc

Please sign in to comment.