Skip to content

Commit

Permalink
Merge pull request #266 from dkpro/refactoring/261-Clean-up-POMs
Browse files Browse the repository at this point in the history 
#261 - Clean up POMs
  • Loading branch information
@reckart
reckart authored Nov 1, 2023
2 parents 2461903 + c0da91a commit 6714d10
Show file tree
Hide file tree
Showing 6 changed files with 248 additions and 169 deletions.
43 changes: 10 additions & 33 deletions dkpro-jwpl-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

<properties>
<!--
By default, we skip the integration tests for regular contributors
as they might not have access to one of the two institution specific
MySQL resource profiles.
-->
By default, we skip the integration tests for regular contributors
as they might not have access to one of the two institution specific
MySQL resource profiles.
-->
<skip.integration.tests>true</skip.integration.tests>
</properties>

Expand Down Expand Up @@ -79,42 +79,19 @@
<artifactId>nv-i18n</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!-- logger dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>

<!-- TEST dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>

<!-- Used in Integration Tests only -->
<dependency>
Expand Down
258 changes: 133 additions & 125 deletions dkpro-jwpl-deps/dkpro-jwpl-swc-engine-shade/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,132 +15,140 @@
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dkpro.jwpl</groupId>
<artifactId>dkpro-jwpl-deps</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>dkpro-jwpl-swc-engine-shade</artifactId>
<name>Dependencies :: Jakarta :: swc-engine</name>
<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.dkpro.jwpl</groupId>
<artifactId>dkpro-jwpl-deps</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>dkpro-jwpl-swc-engine-shade</artifactId>
<name>Dependencies :: Jakarta :: swc-engine</name>

<dependencies>
<dependency>
<groupId>org.sweble.wikitext</groupId>
<artifactId>swc-engine</artifactId>
<version>${org.sweble.wikitext.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>de.fau.cs.osr.ptk</groupId>
<artifactId>ptk-common</artifactId>
</dependency>
<dependency>
<groupId>de.fau.cs.osr.utils</groupId>
<artifactId>utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.sweble.wikitext</groupId>
<artifactId>swc-parser-lazy</artifactId>
</dependency>
<dependency>
<groupId>xtc</groupId>
<artifactId>rats-runtime</artifactId>
<version>1.15.0</version>
</dependency>
</dependencies>
<properties>
<mdep.analyze.skip>true</mdep.analyze.skip>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createSourcesJar>true</createSourcesJar>
<useBaseVersion>true</useBaseVersion>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>org.sweble.wikitext:swc-engine:*</include> <!-- only sweble engine to make sure we don't add other things -->
</includes>
</artifactSet>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<relocations>
<relocation>
<pattern>javax.xml.bind</pattern>
<shadedPattern>jakarta.xml.bind</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!--
Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
When navigating over to java classes, the shaded imported classes will
show as resolved instead of unknown.
The artifact specified below is created when this module built.
But is also used to resolve classes in IntelliJ.
"phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
when running standalone "mvn install" command.
<dependencies>
<dependency>
<groupId>org.sweble.wikitext</groupId>
<artifactId>swc-engine</artifactId>
<version>${org.sweble.wikitext.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>de.fau.cs.osr.ptk</groupId>
<artifactId>ptk-common</artifactId>
</dependency>
<dependency>
<groupId>de.fau.cs.osr.utils</groupId>
<artifactId>utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.sweble.wikitext</groupId>
<artifactId>swc-parser-lazy</artifactId>
</dependency>
<dependency>
<groupId>xtc</groupId>
<artifactId>rats-runtime</artifactId>
<version>1.15.0</version>
</dependency>
</dependencies>

build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
which is handled by maven-shade-plugin.
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>workaround-makeItVisibleOnIntellij</id>
<phase>none</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<type>jar</type>
<classifier>optional</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createSourcesJar>true</createSourcesJar>
<useBaseVersion>true</useBaseVersion>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<!-- only sweble engine to make sure we don't add other things -->
<include>org.sweble.wikitext:swc-engine:*</include>
</includes>
</artifactSet>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
<relocations>
<relocation>
<pattern>javax.xml.bind</pattern>
<shadedPattern>jakarta.xml.bind</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!--
Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded
classes.
When navigating over to java classes, the shaded imported classes will
show as resolved instead of unknown.
The artifact specified below is created when this module built.
But is also used to resolve classes in IntelliJ.
"phase" is set to "none" - with this setting, the artifact jar will not be
uploaded to repo
when running standalone "mvn install" command.
build-helper-maven-plugin can be removed completely with no effect on the
"mvn clean" and "mvn install",
which is handled by maven-shade-plugin.
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>workaround-makeItVisibleOnIntellij</id>
<phase>none</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
<type>jar</type>
<classifier>optional</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
10 changes: 8 additions & 2 deletions dkpro-jwpl-revisionmachine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -71,8 +76,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
14 changes: 9 additions & 5 deletions dkpro-jwpl-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.dkpro.jwpl</groupId>
Expand Down Expand Up @@ -80,6 +75,15 @@
<groupId>org.sweble.wikitext</groupId>
<artifactId>swc-parser-lazy</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Loading

0 comments on commit 6714d10

Please sign in to comment.