Skip to content

Commit

Permalink
Merge remote-tracking branch 'cs/cs-pom' into cs
Browse files Browse the repository at this point in the history 
# Conflicts:
#	pom.xml
  • Loading branch information
@CaylaSavitzky
CaylaSavitzky committed Sep 11, 2024
2 parents 98a7968 + c7c8528 commit dcd506f
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 40 deletions.
2 changes: 1 addition & 1 deletion onebusaway-gtfs-transformer-cli-aws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-gtfs-modules</artifactId>
<version>1.4.18-SNAPSHOT</version>
<version>1.4.20-SNAPSHOT</version>
</parent>

<properties>
Expand Down
118 changes: 79 additions & 39 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.onebusaway</groupId>
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway</artifactId>
<version>1.2.9</version>
</parent>

<artifactId>onebusaway-gtfs-modules</artifactId>
<version>1.4.20-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down Expand Up @@ -61,10 +66,22 @@
<repository>
<id>releases-camsys-public-repo</id>
<url>https://repo.camsys-apps.com/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>snapshots-camsys-public-repo</id>
<url>https://repo.camsys-apps.com/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<distributionManagement>
Expand All @@ -80,7 +97,8 @@
<module>onebusaway-gtfs-hibernate-cli</module>
<module>onebusaway-gtfs-transformer</module>
<module>onebusaway-gtfs-transformer-cli</module>
<!--module>onebusaway-gtfs-transformer-cli-aws</module-->
<!-- module>onebusaway-gtfs-transformer-cli-aws</module-->
<module>onebusaway-gtfs-transformer-cli-aws</module>
<module>onebusaway-gtfs-merge</module>
<module>onebusaway-gtfs-merge-cli</module>
</modules>
Expand Down Expand Up @@ -124,6 +142,12 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4j_version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -188,30 +212,31 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<!-- <plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.5.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
</configuration>
</plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.sonatype.central</groupId>-->
<!-- <artifactId>central-publishing-maven-plugin</artifactId>-->
<!-- <version>0.5.0</version>-->
<!-- <extensions>true</extensions>-->
<!-- <configuration>-->
<!-- <publishingServerId>central</publishingServerId>-->
<!-- <autoPublish>true</autoPublish>-->
<!-- <waitUntil>published</waitUntil>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-source-plugin</artifactId>-->
<!-- <version>2.2.1</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>attach-sources</id>-->
<!-- <goals>-->
<!-- <goal>jar-no-fork</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand All @@ -231,18 +256,34 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<header>LICENSE.txt</header>
<excludes combine.children="append">
<exclude>**/ci.yml</exclude>
<exclude>**/simplelogger.properties</exclude>
</excludes>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
<!-- <version>3.2.4</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>sign-artifacts</id>-->
<!-- <phase>verify</phase>-->
<!-- <goals>-->
<!-- <goal>sign</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -257,5 +298,4 @@
</plugin>
</plugins>
</build>

</project>
</project>

0 comments on commit dcd506f

Please sign in to comment.