pom corrections and ci

Author: akomakom

Jenkinsfile

@@ -15,8 +15,6 @@
  */
 
 //Jenkins integration.
-//See https://svn.terracotta.org/repo/internal/infrastructure/jenkins-pipeline-job-builder/trunk/shared/vars/
-mavenBuild maven_goal: '-V clean deploy  -Ptc-publish,fullmode -Djenkins.publisher=true -Dsag-deps=true'
-
 
+mavenBuild.performRelease increment_pom_version_digit: -1 // increment last digit after release
 

azure-pipelines.yml

@@ -0,0 +1,31 @@
+#
+# Copyright Terracotta, Inc.
+#
+# Licensed 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.
+#
+
+# See shared code location for steps and parameters:
+# https://dev.azure.com/TerracottaCI/_git/terracotta
+
+resources:
+  repositories:
+    - repository: templates
+      type: git
+      name: terracotta/terracotta
+
+jobs:
+  - template: build-templates/maven-common.yml@templates
+    parameters:
+      jobName: Linux_Java_8
+      options: -B -Djava.test.version=1.8 -Djava.test.vendor=zulu -Ptc-publish,fullmode -Dsag-deps=true
+      mavenGoals: 'clean verify'

pom.xml

@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
-   Apache Maven 2 POM generated by Apache Ivy
-   http://ant.apache.org/ivy/
-   Apache Ivy version: 2.2.0 20100923230623
---><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.terracotta.forge</groupId>
     <artifactId>forge-parent</artifactId>
-    <version>4.13</version>
+    <version>4.17</version>
   </parent>
 
   <groupId>org.terracotta</groupId>
@@ -23,59 +20,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.terracottatech</groupId>
+      <groupId>org.terracotta</groupId>
       <artifactId>search</artifactId>
-      <version>1.5.11</version>
+      <version>1.5.13</version>
     </dependency>
-  </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.terracotta</groupId>
-        <artifactId>maven-forge-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <!-- test deps, versions in parent -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+    </dependency>
+  </dependencies>
 
   <scm>
     <connection>scm:git:[email protected]:Terracotta-OSS/tc-messaging.git</connection>
     <developerConnection>scm:git:https://github.com/Terracotta-OSS/tc-messaging.git</developerConnection>
   </scm>
 
-  <distributionManagement>
-    <repository>
-      <id>terracotta-ee-releases</id>
-      <name>Terracotta EE Releases Repository</name>
-      <url>${terracotta-ee-releases-url}</url>
-    </repository>
-    <snapshotRepository>
-      <id>terracotta-ee-snapshots</id>
-       <uniqueVersion>false</uniqueVersion>
-       <name>Terracotta Snapshots Repository</name>
-       <url>${terracotta-ee-snapshots-url}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
+  <!-- minimal set to find the parent -->
   <repositories>
     <repository>
       <id>terracotta-releases</id>
-      <url>http://www.terracotta.org/download/reflector/releases</url>
+      <url>https://repo.terracotta.org/maven2</url>
     </repository>
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>terracotta-releases</id>
-      <url>http://www.terracotta.org/download/reflector/releases</url>
-    </pluginRepository>
-  </pluginRepositories>  
+
 </project>